adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding changes missed in the merge.

Browse source
This commit is contained in:
mark_story 2010-08-15 23:10:29 -04:00
parent 705e90bef7
commit c4a978d386
4 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/dispatcher.php
View file

@ -186,7 +186,7 @@ class Dispatcher extends Object {
$methods = array_flip($controller->methods);
if (!isset($methods[strtolower($params['action'])])) {
if (!isset($methods[$params['action']])) {
if ($controller->scaffold !== false) {
App::import('Controller', 'Scaffold', false);
return new Scaffold($controller, $params);

5
cake/libs/cache/memcache.php vendored
View file

@ -106,9 +106,8 @@ class MemcacheEngine extends CacheEngine {
* @param integer $duration How long to cache the data, in seconds
* @return boolean True if the data was succesfully cached, false on failure
* @see http://php.net/manual/en/memcache.set.php
* @access public
*/
function write($key, &$value, $duration) {
public function write($key, &$value, $duration) {
return $this->__Memcache->set($key, $value, $this->settings['compress'], $duration);
}
@ -118,7 +117,7 @@ class MemcacheEngine extends CacheEngine {
* @param string $key Identifier for the data
* @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
*/
function read($key) {
public function read($key) {
return $this->__Memcache->get($key);
}

11
cake/libs/cake_session.php
View file

@ -498,7 +498,6 @@ class CakeSession {
* Helper method to destroy invalid sessions.
*
* @return void
<<<<<<< HEAD
*/
public static function destroy() {
if (self::started()) {
@ -508,16 +507,6 @@ class CakeSession {
self::$id = null;
self::start();
self::renew();
=======
* @access public
*/
function destroy() {
$_SESSION = null;
$this->__construct($this->path);
$this->start();
$this->renew();
$this->_checkValid();
>>>>>>> 1.3
}
/**

6
cake/libs/model/behaviors/acl.php
View file

@ -67,7 +67,7 @@ class AclBehavior extends ModelBehavior {
* @return array
* @link http://book.cakephp.org/view/1322/node
*/
function node(&$model, $ref = null) {
public function node(&$model, $ref = null) {
$type = $this->__typeMaps[$this->settings[$model->name]['type']];
if (empty($ref)) {
$ref = array('model' => $model->name, 'foreign_key' => $model->id);
@ -81,7 +81,7 @@ class AclBehavior extends ModelBehavior {
* @param boolean $created True if this is a new record
* @return void
*/
function afterSave(&$model, $created) {
public function afterSave(&$model, $created) {
$type = $this->__typeMaps[$this->settings[$model->name]['type']];
$parent = $model->parentNode();
if (!empty($parent)) {
@ -105,7 +105,7 @@ class AclBehavior extends ModelBehavior {
*
* @return void
*/
function afterDelete(&$model) {
public function afterDelete(&$model) {
$type = $this->__typeMaps[$this->settings[$model->name]['type']];
$node = Set::extract($this->node($model), "0.{$type}.id");
if (!empty($node)) {