Extracting a method from paginator component.

cakephp · Dec 18, 2010 · a6cca7c · a6cca7c
1 parent 7c6af5b
commit a6cca7c
Showing 1 changed file with 47 additions and 36 deletions.
diff --git a/cake/libs/controller/components/paginator.php b/cake/libs/controller/components/paginator.php
@@ -64,42 +64,7 @@ public function paginate($object = null, $scope = array(), $whitelist = array())
 		}
 		$assoc = null;
 
-		if (is_string($object)) {
-			$assoc = null;
-			if (strpos($object, '.')  !== false) {
-				list($object, $assoc) = pluginSplit($object);
-			}
-
-			if ($assoc && isset($this->Controller->{$object}->{$assoc})) {
-				$object = $this->Controller->{$object}->{$assoc};
-			} elseif (
-				$assoc && isset($this->Controller->{$this->Controller->modelClass}) &&
-				isset($this->Controller->{$this->Controller->modelClass}->{$assoc}
-			)) {
-				$object = $this->Controller->{$this->Controller->modelClass}->{$assoc};
-			} elseif (isset($this->Controller->{$object})) {
-				$object = $this->Controller->{$object};
-			} elseif (
-				isset($this->Controller->{$this->Controller->modelClass}) && isset($this->Controller->{$this->Controller->modelClass}->{$object}
-			)) {
-				$object = $this->Controller->{$this->Controller->modelClass}->{$object};
-			}
-		} elseif (empty($object) || $object === null) {
-			if (isset($this->Controller->{$this->Controller->modelClass})) {
-				$object = $this->Controller->{$this->Controller->modelClass};
-			} else {
-				$className = null;
-				$name = $this->Controller->uses[0];
-				if (strpos($this->Controller->uses[0], '.') !== false) {
-					list($name, $className) = explode('.', $this->Controller->uses[0]);
-				}
-				if ($className) {
-					$object = $this->Controller->{$className};
-				} else {
-					$object = $this->Controller->{$name};
-				}
-			}
-		}
+		$object = $this->_getObject($object);
 
 		if (!is_object($object)) {
 			throw new MissingModelException($object);
@@ -252,4 +217,50 @@ public function paginate($object = null, $scope = array(), $whitelist = array())
 		}
 		return $results;
 	}
+
+/**
+ * Get the object pagination will occur on.
+ *
+ * @param mixed $object The object you are looking for.
+ * @return mixed The model object to paginate on.
+ */
+	protected function _getObject($object) {
+		if (is_string($object)) {
+			$assoc = null;
+			if (strpos($object, '.')  !== false) {
+				list($object, $assoc) = pluginSplit($object);
+			}
+
+			if ($assoc && isset($this->Controller->{$object}->{$assoc})) {
+				$object = $this->Controller->{$object}->{$assoc};
+			} elseif (
+				$assoc && isset($this->Controller->{$this->Controller->modelClass}) &&
+				isset($this->Controller->{$this->Controller->modelClass}->{$assoc}
+			)) {
+				$object = $this->Controller->{$this->Controller->modelClass}->{$assoc};
+			} elseif (isset($this->Controller->{$object})) {
+				$object = $this->Controller->{$object};
+			} elseif (
+				isset($this->Controller->{$this->Controller->modelClass}) && isset($this->Controller->{$this->Controller->modelClass}->{$object}
+			)) {
+				$object = $this->Controller->{$this->Controller->modelClass}->{$object};
+			}
+		} elseif (empty($object) || $object === null) {
+			if (isset($this->Controller->{$this->Controller->modelClass})) {
+				$object = $this->Controller->{$this->Controller->modelClass};
+			} else {
+				$className = null;
+				$name = $this->Controller->uses[0];
+				if (strpos($this->Controller->uses[0], '.') !== false) {
+					list($name, $className) = explode('.', $this->Controller->uses[0]);
+				}
+				if ($className) {
+					$object = $this->Controller->{$className};
+				} else {
+					$object = $this->Controller->{$name};
+				}
+			}
+		}
+		return $object;
+	}
 }