From c4a978d38678c4af972d87582f8ec5a79a58e981 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Aug 2010 23:10:29 -0400
Subject: [PATCH] Adding changes missed in the merge.

---
 cake/dispatcher.php               |  2 +-
 cake/libs/cache/memcache.php      |  5 ++---
 cake/libs/cake_session.php        | 11 -----------
 cake/libs/model/behaviors/acl.php |  6 +++---
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 26f548460..21811a0f3 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -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);
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 734bec8a5..077f5cba0 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -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);
 	}
 
diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index a1c178e6d..b41237dae 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -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
 	}
 
 /**
diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
index 9c2ff415e..905040e3f 100644
--- a/cake/libs/model/behaviors/acl.php
+++ b/cake/libs/model/behaviors/acl.php
@@ -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)) {