From 9d799ec7ca40e5437da219f0e2db1d77c8ea7243 Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Tue, 14 Aug 2007 18:46:22 +0000
Subject: [PATCH] Expanding model support for Controller::paginate()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5519 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/controller/controller.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 7e37a0415..fab1e3dfd 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -637,6 +637,10 @@ class Controller extends Object {
 		}
 		$this->params['models'] = $this->modelNames;
 
+		if (Configure::read() > 2) {
+			$this->set('cakeDebug', $this);
+		}
+
 		$this->__viewClass =& new $viewClass($this);
 		if (!empty($this->modelNames)) {
 			$models = array();
@@ -1005,8 +1009,9 @@ class Controller extends Object {
 			$scope = $object;
 			$object = null;
 		}
+		$assoc = null;
 
-		if (is_string($object)) {
+		if (is_string($object) && !strpos($object, '.')) {
 			if (isset($this->{$object})) {
 				$object = $this->{$object};
 			} elseif (isset($this->{$this->modelClass}) && isset($this->{$this->modelClass}->{$object})) {
@@ -1020,6 +1025,11 @@ class Controller extends Object {
 					}
 				}
 			}
+		} elseif (is_string($object)) {
+			list($object, $assoc) = explode('.', $object);
+			if (isset($this->{$object})) {
+				$object = $this->{$object};
+			}
 		} elseif (empty($object) || $object == null) {
 			if (isset($this->{$this->modelClass})) {
 				$object = $this->{$this->modelClass};
@@ -1029,7 +1039,7 @@ class Controller extends Object {
 		}
 
 		if (!is_object($object)) {
-			// Error: can't find object
+			trigger_error(sprintf(__("Controller::paginate() - can't find model %s in controller %sController", true), $object, $this->name), E_USER_WARNING);
 			return array();
 		}
 		$options = am($this->params, $this->params['url'], $this->passedArgs);