[limb-svn] r6010 - 3.x/trunk/limb/cms/src/model

[svn at limb-project.com]

Author: pachanga
Date: 2007-06-21 13:46:14 +0400 (Thu, 21 Jun 2007)
New Revision: 6010
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6010

Modified:
   3.x/trunk/limb/cms/src/model/lmbCmsClassName.class.php
   3.x/trunk/limb/cms/src/model/lmbCmsDocument.class.php
   3.x/trunk/limb/cms/src/model/lmbCmsFileObject.class.php
Log:
-- removing unnecessary $conn checks and lmbActiveRecord :: getDefaultConnection() calls for static method calls, this is not necessary since these checks will happen in lmbActiveRecord anyway. However $conn argument should be passed.

Modified: 3.x/trunk/limb/cms/src/model/lmbCmsClassName.class.php
===================================================================
--- 3.x/trunk/limb/cms/src/model/lmbCmsClassName.class.php	2007-06-21 09:19:18 UTC (rev 6009)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsClassName.class.php	2007-06-21 09:46:14 UTC (rev 6010)
@@ -26,13 +26,8 @@
     else
       $title = $object;
 
-    if(!is_object($conn))
-      $conn = lmbActiveRecord :: getDefaultConnection();
-
     $criteria = new lmbSQLFieldCriteria('title', $title);
-    if($obj = lmbActiveRecord :: findFirst('lmbCmsClassName',
-                                           array('criteria' => $criteria),
-                                           $conn))
+    if($obj = lmbActiveRecord :: findFirst('lmbCmsClassName', array('criteria' => $criteria), $conn))
     {
       return $obj->id;
     }

Modified: 3.x/trunk/limb/cms/src/model/lmbCmsDocument.class.php
===================================================================
--- 3.x/trunk/limb/cms/src/model/lmbCmsDocument.class.php	2007-06-21 09:19:18 UTC (rev 6009)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsDocument.class.php	2007-06-21 09:46:14 UTC (rev 6010)
@@ -37,9 +37,6 @@
     if(!$parent_id)
       $parent_id = 0;
 
-    if(!is_object($conn))
-      $conn = lmbActiveRecord :: getDefaultConnection();
-
     $sql = 'SELECT document.* '.
            ' FROM document LEFT JOIN node ON node.id = document.node_id '.
            ' WHERE node.parent_id = '. $parent_id;

Modified: 3.x/trunk/limb/cms/src/model/lmbCmsFileObject.class.php
===================================================================
--- 3.x/trunk/limb/cms/src/model/lmbCmsFileObject.class.php	2007-06-21 09:19:18 UTC (rev 6009)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsFileObject.class.php	2007-06-21 09:46:14 UTC (rev 6010)
@@ -57,9 +57,6 @@
            ' FROM file_object LEFT JOIN node ON node.id = file_object.node_id '.
            ' WHERE node.parent_id = '. $parent->id;
 
-    if(!is_object($conn))
-      $conn = lmbActiveRecord :: getDefaultConnection();
-
     $stmt = $conn->newStatement($sql);
     return lmbActiveRecord :: decorateRecordSet($stmt->getRecordSet(), 'FileObject', $conn);
   }