[limb-svn] r5872 - in 2.x/trunk: i18n/strings src/actions/objects_access src/db src/security src/site_objects

[svn at limb-project.com]

Author: 3dmax
Date: 2007-05-12 11:50:34 +0400 (Sat, 12 May 2007)
New Revision: 5872
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5872

Modified:
   2.x/trunk/i18n/strings/cache_manager_ru.ini
   2.x/trunk/src/actions/objects_access/group_objects_access_tree_toggle_action.class.php
   2.x/trunk/src/db/db_caching_driver.class.php
   2.x/trunk/src/db/db_driver.class.php
   2.x/trunk/src/security/user.class.php
   2.x/trunk/src/site_objects/site_object.class.php
Log:
-- fixed misprint in tree_toggle_action
-- added string in cache_manager_ru.ini
-- fix for PHP 4.4.x

Modified: 2.x/trunk/i18n/strings/cache_manager_ru.ini
===================================================================
--- 2.x/trunk/i18n/strings/cache_manager_ru.ini	2007-05-11 21:01:02 UTC (rev 5871)
+++ 2.x/trunk/i18n/strings/cache_manager_ru.ini	2007-05-12 07:50:34 UTC (rev 5872)
@@ -1,8 +1,8 @@
-
 [constants]
 
 flush_full_page_cache = Очистить полностраничный кеш
 flush_partial_page_cache = Очистить частичный кеш страниц
 flush_ini_cache = Очистить кеш ini-файлов
+flush_general_cache = Очистить кеш дерева
 flush_template_cache = Очистить кеш шаблонов
 flush_image_cache = Очистить кеш картинок

Modified: 2.x/trunk/src/actions/objects_access/group_objects_access_tree_toggle_action.class.php
===================================================================
--- 2.x/trunk/src/actions/objects_access/group_objects_access_tree_toggle_action.class.php	2007-05-11 21:01:02 UTC (rev 5871)
+++ 2.x/trunk/src/actions/objects_access/group_objects_access_tree_toggle_action.class.php	2007-05-12 07:50:34 UTC (rev 5872)
@@ -13,7 +13,7 @@
 
 class group_objects_access_tree_toggle_action extends form_action
 {
-  var $objects_ids = array();
+  var $object_ids = array();
 
   function _define_dataspace_name()
   {

Modified: 2.x/trunk/src/db/db_caching_driver.class.php
===================================================================
--- 2.x/trunk/src/db/db_caching_driver.class.php	2007-05-11 21:01:02 UTC (rev 5871)
+++ 2.x/trunk/src/db/db_caching_driver.class.php	2007-05-12 07:50:34 UTC (rev 5872)
@@ -72,11 +72,12 @@
     return $this->sql_exec($this->make_delete_string($table, $where));
   }
 
-  function get_array($index='')
+  function & get_array($index='')
   {
     if($this->_is_cache_hit())
     {
-      return $this->_rehash_if_neccessary($this->_get_cache(), $index);
+      $arr = $this->_rehash_if_neccessary($this->_get_cache(), $index);
+      return $arr;
     }
     else
     {

Modified: 2.x/trunk/src/db/db_driver.class.php
===================================================================
--- 2.x/trunk/src/db/db_driver.class.php	2007-05-11 21:01:02 UTC (rev 5871)
+++ 2.x/trunk/src/db/db_driver.class.php	2007-05-12 07:50:34 UTC (rev 5872)
@@ -201,7 +201,7 @@
      return $this->get_last_error() . "\n" . $sql;
   }
 
-  function get_array($array_index='')
+  function & get_array($array_index='')
   {
     $result_array = array();
 
@@ -213,10 +213,10 @@
     $col_num = $this->_result_num_fields();
 
     if($array_index)
-      while($arr = $this->_fetch_assoc_result_row($col_num))
+      while($arr =& $this->_fetch_assoc_result_row($col_num))
         $result_array[$arr[$array_index]] = $arr;
     else
-      while($arr = $this->_fetch_assoc_result_row($col_num))
+      while($arr =& $this->_fetch_assoc_result_row($col_num))
         $result_array[] = $arr;
 
     $this->free_result();

Modified: 2.x/trunk/src/security/user.class.php
===================================================================
--- 2.x/trunk/src/security/user.class.php	2007-05-11 21:01:02 UTC (rev 5871)
+++ 2.x/trunk/src/security/user.class.php	2007-05-12 07:50:34 UTC (rev 5872)
@@ -149,7 +149,7 @@
     if(!$record = $this->_get_identity_record_by_id($cookie['user_id'], $cookie['password']))
       return false;
 
-    $this->_set_logged_user_data($record, $locale_id);
+    $this->_set_logged_user_data($record);
 
     return true;
   }
@@ -189,7 +189,7 @@
     return $identity_record;
   }
 
-  function &_get_identity_record_by_id($user_id, $crypted_password)
+  function _get_identity_record_by_id($user_id, $crypted_password)
   {
     $db =& db_factory :: instance();
 

Modified: 2.x/trunk/src/site_objects/site_object.class.php
===================================================================
--- 2.x/trunk/src/site_objects/site_object.class.php	2007-05-11 21:01:02 UTC (rev 5871)
+++ 2.x/trunk/src/site_objects/site_object.class.php	2007-05-12 07:50:34 UTC (rev 5872)
@@ -271,7 +271,7 @@
 
     $db->sql_exec($sql, $limit, $offset);
 
-    $arr = $db->get_array('id');
+    $arr =& $db->get_array('id');
     return $arr;
   }
 
@@ -311,7 +311,6 @@
     $sql_params['conditions'][] =  " AND sso.id IN {$ids}";
 
     $arr =& $this->fetch($params, $sql_params);
-
     return $arr;
   }