diff --git a/install.php b/install.php index bb296703..a8eab883 100644 --- a/install.php +++ b/install.php @@ -11,9 +11,10 @@ * If that file exists, the installer will not run. So if you need to re-run this installer for any * reason, then you'll want to delete that file. This was implemented just in case someone doesn't delete the installer. * - * ProcessWire 3.x, Copyright 2019 by Ryan Cramer + * ProcessWire 3.x, Copyright 2021 by Ryan Cramer * https://processwire.com * + * @todo 3.0.190: provide option for command-line options to install * @todo have installer set session name * */ diff --git a/wire/core/PageFinder.php b/wire/core/PageFinder.php index 6fc02f63..300ab93f 100644 --- a/wire/core/PageFinder.php +++ b/wire/core/PageFinder.php @@ -992,7 +992,7 @@ class PageFinder extends Wire { // first iteration only, see if it's a native column and prevent sortsAfter if so break; } - if(strpos($selector->value, '.') !== false) { + if(strpos($selector->value(), '.') !== false) { // we don't supports sortsAfter for subfields, so abandon entirely $sortsAfter = array(); break; @@ -2206,6 +2206,9 @@ class PageFinder extends Wire { $database = $this->database; $user = $this->wire()->user; $language = $this->languages && $user->language ? $user->language : null; + + // todo 3.0.190: uncomment the line below to support `sort=a|b|c` in correct order + // if(count($values) > 1) $values = array_reverse($values); // because orderby prepend used below foreach($values as $value) { diff --git a/wire/modules/Inputfield/InputfieldImage/InputfieldImage.scss b/wire/modules/Inputfield/InputfieldImage/InputfieldImage.scss index a4d6c596..e95494ca 100755 --- a/wire/modules/Inputfield/InputfieldImage/InputfieldImage.scss +++ b/wire/modules/Inputfield/InputfieldImage/InputfieldImage.scss @@ -925,3 +925,9 @@ $focusPointCircleSize: 40px; display: none; white-space: nowrap; } + +/* todo: 3.0.190 improves touch support but needs further testing +.gridImage__edit { display:block !important; } +.gridImage__edit span { display:none; } +.gridImage__edit:hover span { display:inline; } +*/ \ No newline at end of file diff --git a/wire/modules/PageRender.module b/wire/modules/PageRender.module index 395db84f..ff269c0e 100644 --- a/wire/modules/PageRender.module +++ b/wire/modules/PageRender.module @@ -81,7 +81,8 @@ class PageRender extends WireData implements Module, ConfigurableModule { * */ public function ready() { - if($this->wire('page')->template != 'admin') { + // todo 3.0.190: remove template!=admin condition: https://github.com/processwire/processwire-issues/issues/1424 + if($this->wire()->page->template != 'admin') { $this->addHookBefore('Page::render', $this, 'beforeRenderPage', array('priority' => 1)); } }