Merge branch 'dev' of git://github.com/ceeram/infinitas into dev

infinitas · Jan 7, 2010 · 4d1ae37 · 4d1ae37
2 parents 6c7763e + ab7e540
commit 4d1ae37
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app_model.php b/app_model.php
@@ -26,7 +26,7 @@ class AppModel extends Model {
 	/**
 	* Behaviors to attach to the site.
 	*/
-	var $actsAs = array('Containable', 'Core.Lockable');
+	var $actsAs = array('Containable', 'Core.Lockable', 'Core.Logable');
 }
 
 ?>
diff --git a/infinitas/core/models/behaviors/viewable.php b/infinitas/core/models/behaviors/viewable.php
@@ -67,7 +67,7 @@ function afterFind(&$Model, $data) {
 				$Model->primaryKey} = $data[0][$Model->alias][$Model->primaryKey];
 			$Model->saveField($this->__settings[$Model->alias]['view_counter'],
 				$data[0][$Model->alias][$this->__settings[$Model->alias]['view_counter']]
-				);
+				, array('callbacks'=>false));
 		}
 
 		return $data;