diff --git a/wire/config.php b/wire/config.php index 25f92c8c..8142209e 100644 --- a/wire/config.php +++ b/wire/config.php @@ -247,8 +247,8 @@ $config->sessionExpireSeconds = 86400; * // if there is a session cookie, a session is likely already in use so keep it going * if($session->hasCookie()) return true; * - * // if URL is an admin URL, allow session - * if(strpos($_SERVER['REQUEST_URI'], $session->config->urls->admin) === 0) return true; + * // if URL is an admin URL, allow session (replace /processwire/ with your admin URL) + * if(strpos($_SERVER['REQUEST_URI'], '/processwire/) === 0) return true; * * // otherwise disallow session * return false; diff --git a/wire/core/FunctionsWireAPI.php b/wire/core/FunctionsWireAPI.php index 1769cbb0..0753b7a3 100644 --- a/wire/core/FunctionsWireAPI.php +++ b/wire/core/FunctionsWireAPI.php @@ -35,7 +35,7 @@ function _wirePagesAPI($_apiVar, $selector) { /** @var Pages|PagesType $pages */ - $pages = wire($_apiVar); + $pages = is_object($_apiVar) ? $_apiVar : wire($_apiVar); if(!$pages) return null; if(!$selector) return $pages; diff --git a/wire/core/Interfaces.php b/wire/core/Interfaces.php index a2729fca..4a7cf6a4 100644 --- a/wire/core/Interfaces.php +++ b/wire/core/Interfaces.php @@ -19,6 +19,7 @@ * Item must have a gettable/settable 'id' property for this interface as well * * @property int $id + * @property string $name * */ interface Saveable { diff --git a/wire/core/Template.php b/wire/core/Template.php index 3489bac5..047834ba 100644 --- a/wire/core/Template.php +++ b/wire/core/Template.php @@ -1185,6 +1185,10 @@ class Template extends WireData implements Saveable, Exportable { public function __isset($key) { return isset($this->settings[$key]) || isset($this->data[$key]); } + + public function __debugInfo() { + return array_merge(array('settings' => $this->settings), parent::__debugInfo()); + } }