dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- PHP Framework upgrade 3.5.0 -> 3.5.1 (fixes some issues with CREST cURL caching, and SESSION management)

Browse Source 
- #138 added "cookie logout" to "logout" menu entry
This commit is contained in:
Exodus4D
2016-05-06 18:09:28 +02:00
parent eb1e365020
commit dfd1e8501d
28 changed files with 575 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/lib/db/sql/mapper.php
View File

@@ -190,7 +190,7 @@ class Mapper extends \DB\Cursor {
/**
* Build query string and execute
* @return \DB\SQL\Mapper[]
* @return static[]
* @param $fields string
* @param $filter string|array
* @param $options array
@@ -294,7 +294,7 @@ class Mapper extends \DB\Cursor {
/**
* Return records that match criteria
* @return \DB\SQL\Mapper[]
* @return static[]
* @param $filter string|array
* @param $options array
* @param $ttl int
@@ -362,7 +362,7 @@ class Mapper extends \DB\Cursor {
$field['value']=$dry?NULL:$out->adhoc[$key]['value'];
unset($field);
}
if (isset($this->trigger['load']))
if (!$dry && isset($this->trigger['load']))
\Base::instance()->call($this->trigger['load'],$this);
return $out;
}
@@ -559,14 +559,8 @@ class Mapper extends \DB\Cursor {
if ($func)
$var=call_user_func($func,$var);
foreach ($var as $key=>$val)
if (in_array($key,array_keys($this->fields))) {
$field=&$this->fields[$key];
if ($field['value']!==$val) {
$field['value']=$val;
$field['changed']=TRUE;
}
unset($field);
}
if (in_array($key,array_keys($this->fields)))
$this->set($key,$val);
}
/**