diff --git a/wire/core/PagesPathFinder.php b/wire/core/PagesPathFinder.php index a3ea6cfa..ff55c3a1 100644 --- a/wire/core/PagesPathFinder.php +++ b/wire/core/PagesPathFinder.php @@ -1925,7 +1925,7 @@ class PagesPathFinder extends Wire { $segments = $this->languageSegments(); $segments[] = Pages::defaultRootName; foreach($segments as $segment) { - if(!strlen($segment)) continue; + if($segment === null || !strlen($segment)) continue; if($path !== "/$segment" && strpos($path, "/$segment/") !== 0) continue; list(,$path) = explode("/$segment", $path, 2); if($path === '') $path = '/'; diff --git a/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module b/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module index e4bdd36f..feb25ea2 100644 --- a/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module +++ b/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module @@ -75,7 +75,7 @@ class FieldtypeRepeater extends Fieldtype implements ConfigurableModule { * @var bool * */ - static protected $isReady = false; + static protected $isReady = array(); /** * When non-zero, a deletePageField function call occurred and we shouldn't re-create any repeater parents diff --git a/wire/modules/Inputfield/InputfieldMarkup.module b/wire/modules/Inputfield/InputfieldMarkup.module index 21aef816..eb9f3085 100644 --- a/wire/modules/Inputfield/InputfieldMarkup.module +++ b/wire/modules/Inputfield/InputfieldMarkup.module @@ -90,7 +90,7 @@ class InputfieldMarkup extends InputfieldWrapper { if($markupFunction !== null & is_callable($markupFunction)) { $out .= "\n" . call_user_func($markupFunction, $this); } - if(strlen($markupText)) { + if(is_string($markupText) && strlen($markupText)) { $out .= "\n" . $markupText; } $out = trim($out); diff --git a/wire/modules/LanguageSupport/LanguageSupportPageNames.module b/wire/modules/LanguageSupport/LanguageSupportPageNames.module index 76f65b34..79972789 100644 --- a/wire/modules/LanguageSupport/LanguageSupportPageNames.module +++ b/wire/modules/LanguageSupport/LanguageSupportPageNames.module @@ -512,7 +512,7 @@ class LanguageSupportPageNames extends WireData implements Module, ConfigurableM // special case: homepage $name = $isDefault ? '' : $page->get("name$language"); if($isDefault && $this->useHomeSegment) $name = $page->name; - if($name == Pages::defaultRootName || !strlen($name)) return '/'; + if($name == Pages::defaultRootName || $name === null || !strlen($name)) return '/'; return $template->slashUrls ? "/$name/" : "/$name"; }