[Isocial-svn] SF.net SVN: isocial: [214] akelos.diff

[<agu...@us...>]

Revision: 214
          http://isocial.svn.sourceforge.net/isocial/?rev=214&view=rev
Author:   aguidrevitch
Date:     2008-05-21 02:03:08 -0700 (Wed, 21 May 2008)

Log Message:
-----------
some extra akelos fixes

Modified Paths:
--------------
    akelos.diff

Modified: akelos.diff
===================================================================
--- akelos.diff	2008-05-20 17:38:44 UTC (rev 213)
+++ akelos.diff	2008-05-21 09:03:08 UTC (rev 214)
@@ -1,6 +1,6 @@
 Index: lib/Ak.php
 ===================================================================
---- lib/Ak.php	(revision 578)
+--- lib/Ak.php	(revision 581)
 +++ lib/Ak.php	(working copy)
 @@ -183,6 +183,11 @@
              return @$string[$try_whith_lang];
@@ -25,9 +25,9 @@
          }
 Index: lib/AkActionController.php
 ===================================================================
---- lib/AkActionController.php	(revision 578)
+--- lib/AkActionController.php	(revision 581)
 +++ lib/AkActionController.php	(working copy)
-@@ -749,7 +749,14 @@
+@@ -750,7 +750,14 @@
       */
      function t($string, $array = null)
      {
@@ -43,7 +43,7 @@
      }
  
  
-@@ -1949,6 +1956,9 @@
+@@ -1950,6 +1957,9 @@
      {
          if(method_exists(&$this, $action)){
              call_user_func_array(array(&$this, $action), @(array)$this->passed_args);
@@ -53,9 +53,32 @@
          }
      }
  
+Index: lib/AkInstaller.php
+===================================================================
+--- lib/AkInstaller.php	(revision 581)
++++ lib/AkInstaller.php	(working copy)
+@@ -356,11 +356,13 @@
+ 
+     function dropTable($table_name, $options = array())
+     {
+-        $result = $this->tableExists($table_name) ? $this->db->execute('DROP TABLE '.$table_name) : true;
+-        if($result){
+-            unset($this->available_tables[array_search($table_name, $this->available_tables)]);
+-            if(!empty($options['sequence'])){
+-                $this->dropSequence($table_name);
++        if($this->tableExists($table_name)){
++            $result = $this->db->execute('DROP TABLE '.$table_name);
++            if ($result) {
++                unset($this->available_tables[array_search($table_name, $this->available_tables)]);
++                if(!empty($options['sequence'])){
++                    $this->dropSequence($table_name);
++                }
+             }
+         }
+     }
 Index: lib/AkActionView/helpers/text_helper.php
 ===================================================================
---- lib/AkActionView/helpers/text_helper.php	(revision 578)
+--- lib/AkActionView/helpers/text_helper.php	(revision 581)
 +++ lib/AkActionView/helpers/text_helper.php	(working copy)
 @@ -518,8 +518,18 @@
      */
@@ -80,7 +103,7 @@
      /**
 Index: lib/AkActiveRecord.php
 ===================================================================
---- lib/AkActiveRecord.php	(revision 578)
+--- lib/AkActiveRecord.php	(revision 581)
 +++ lib/AkActiveRecord.php	(working copy)
 @@ -5012,6 +5012,7 @@
  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.