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

[svn at limb-project.com]

Author: serega
Date: 2007-06-19 13:07:26 +0400 (Tue, 19 Jun 2007)
New Revision: 6001
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6001

Modified:
   3.x/trunk/limb/cms/src/model/lmbCmsClassName.class.php
   3.x/trunk/limb/cms/src/model/lmbCmsDocument.class.php
Log:
-- fixed a bug witn lmbCmsClassName :: generateIdFor() used this->_db_conn in static method
-- the same thing witn lmbCmsDocument :: findKidsForParent()

Modified: 3.x/trunk/limb/cms/src/model/lmbCmsClassName.class.php
===================================================================
--- 3.x/trunk/limb/cms/src/model/lmbCmsClassName.class.php	2007-06-18 14:35:27 UTC (rev 6000)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsClassName.class.php	2007-06-19 09:07:26 UTC (rev 6001)
@@ -19,17 +19,20 @@
 {
   protected $_db_table_name = 'class_name';
 
-  static function generateIdFor($object)
+  static function generateIdFor($object, $conn = null)
   {
     if(is_object($object))
       $title = get_class($object);
     else
       $title = $object;
 
+    if(!is_object($conn))
+      $conn = lmbActiveRecord :: getDefaultConnection();
+
     $criteria = new lmbSQLFieldCriteria('title', $title);
     if($obj = lmbActiveRecord :: findFirst('lmbCmsClassName',
                                            array('criteria' => $criteria),
-                                           $this->_db_conn))
+                                           $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-18 14:35:27 UTC (rev 6000)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsDocument.class.php	2007-06-19 09:07:26 UTC (rev 6001)
@@ -32,16 +32,19 @@
     return $validator;
   }
 
-  function findKidsForParent($parent_id)
+  static function findKidsForParent($parent_id, $conn = null)
   {
     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;
 
-    return lmbActiveRecord :: findBySql('lmbCmsDocument', $sql, $this->_db_conn);
+    return lmbActiveRecord :: findBySql('lmbCmsDocument', $sql, $conn);
   }
 
   function getPublishedKids()