mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-08 07:47:00 +02:00
Code Issues Releases Wiki Activity

Various minor adjustments

Browse Source
This commit is contained in:
Ryan Cramer
2019-02-08 14:46:20 -05:00
parent 5b45d17991
commit 65454985b1
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wire/config.php
View File

@@ -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 there is a session cookie, a session is likely already in use so keep it going
* if($session->hasCookie()) return true; * if($session->hasCookie()) return true;
* *
* // if URL is an admin URL, allow session * // if URL is an admin URL, allow session (replace /processwire/ with your admin URL)
* if(strpos($_SERVER['REQUEST_URI'], $session->config->urls->admin) === 0) return true; * if(strpos($_SERVER['REQUEST_URI'], '/processwire/) === 0) return true;
* *
* // otherwise disallow session * // otherwise disallow session
* return false; * return false;

2
wire/core/FunctionsWireAPI.php
View File

@@ -35,7 +35,7 @@
function _wirePagesAPI($_apiVar, $selector) { function _wirePagesAPI($_apiVar, $selector) {
/** @var Pages|PagesType $pages */ /** @var Pages|PagesType $pages */
$pages = wire($_apiVar); $pages = is_object($_apiVar) ? $_apiVar : wire($_apiVar);
if(!$pages) return null; if(!$pages) return null;
if(!$selector) return $pages; if(!$selector) return $pages;

1
wire/core/Interfaces.php
View File

@@ -19,6 +19,7 @@
* Item must have a gettable/settable 'id' property for this interface as well * Item must have a gettable/settable 'id' property for this interface as well
* *
* @property int $id * @property int $id
* @property string $name
* *
*/ */
interface Saveable { interface Saveable {

4
wire/core/Template.php
View File

@@ -1185,6 +1185,10 @@ class Template extends WireData implements Saveable, Exportable {
public function __isset($key) { public function __isset($key) {
return isset($this->settings[$key]) || isset($this->data[$key]); return isset($this->settings[$key]) || isset($this->data[$key]);
} }
public function __debugInfo() {
return array_merge(array('settings' => $this->settings), parent::__debugInfo());
}
} }