Browse Source

Remove leftover recursive

euromark 10 years ago
parent
commit
9aaf41c14b
3 changed files with 2 additions and 6 deletions
  1. 0 2
      Controller/QurlsController.php
  2. 1 2
      Model/Behavior/LogableBehavior.php
  3. 1 2
      Model/MyModel.php

+ 0 - 2
Controller/QurlsController.php

@@ -42,7 +42,6 @@ class QurlsController extends ToolsAppController {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function admin_index() {
 	public function admin_index() {
-		$this->Qurl->recursive = 0;
 		$qurls = $this->paginate();
 		$qurls = $this->paginate();
 		$this->set(compact('qurls'));
 		$this->set(compact('qurls'));
 	}
 	}
@@ -51,7 +50,6 @@ class QurlsController extends ToolsAppController {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function admin_view($id = null) {
 	public function admin_view($id = null) {
-		$this->Qurl->recursive = 0;
 		if (empty($id) || !($qurl = $this->Qurl->find('first', ['conditions' => ['Qurl.id' => $id]]))) {
 		if (empty($id) || !($qurl = $this->Qurl->find('first', ['conditions' => ['Qurl.id' => $id]]))) {
 			$this->Flash->error(__('invalidRecord'));
 			$this->Flash->error(__('invalidRecord'));
 			return $this->Common->autoRedirect(['action' => 'index']);
 			return $this->Common->autoRedirect(['action' => 'index']);

+ 1 - 2
Model/Behavior/LogableBehavior.php

@@ -210,8 +210,7 @@ class LogableBehavior extends ModelBehavior {
 			UserModel->alias][$this->UserModel->primaryKey] && isset($this->user[$this->UserModel->alias][$this->UserModel->displayField])) {
 			UserModel->alias][$this->UserModel->primaryKey] && isset($this->user[$this->UserModel->alias][$this->UserModel->displayField])) {
 			$username = $this->user[$this->UserModel->alias][$this->UserModel->displayField];
 			$username = $this->user[$this->UserModel->alias][$this->UserModel->displayField];
 		} else {
 		} else {
-			$this->UserModel->recursive = -1;
-			$user = $this->UserModel->find('first', ['conditions' => [$this->UserModel->primaryKey => $userId]]);
+			$user = $this->UserModel->find('first', ['recursive' => -1, 'conditions' => [$this->UserModel->primaryKey => $userId]]);
 			$username = $user[$this->UserModel->alias][$this->UserModel->displayField];
 			$username = $user[$this->UserModel->alias][$this->UserModel->displayField];
 		}
 		}
 		$fields = [];
 		$fields = [];

+ 1 - 2
Model/MyModel.php

@@ -464,8 +464,7 @@ class MyModel extends ShimModel {
 						break;
 						break;
 					}
 					}
 
 
-					$this->recursive = -1;
-					//setup formating
+					//setup formatting
 					$format = '';
 					$format = '';
 					if (!isset($options['format'])) {
 					if (!isset($options['format'])) {
 						for ($i = 0; $i < (count($options['fields']) - 1); $i++) {
 						for ($i = 0; $i < (count($options['fields']) - 1); $i++) {