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

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

Revision: 292
          http://isocial.svn.sourceforge.net/isocial/?rev=292&view=rev
Author:   aguidrevitch
Date:     2008-08-25 12:41:19 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
patch against latest akelos

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

Modified: akelos.diff
===================================================================
--- akelos.diff	2008-08-25 12:39:39 UTC (rev 291)
+++ akelos.diff	2008-08-25 12:41:19 UTC (rev 292)
@@ -1,8 +1,8 @@
 Index: lib/Ak.php
 ===================================================================
---- lib/Ak.php	(revision 834)
+--- lib/Ak.php	(revision 1030)
 +++ lib/Ak.php	(working copy)
-@@ -183,6 +183,11 @@
+@@ -186,6 +186,11 @@
              return @$string[$try_whith_lang];
          }
  
@@ -14,7 +14,7 @@
          if(isset($controller) && !isset($framework_dictionary[$controller.'_dictionary']) && is_file(AK_APP_DIR.DS.'locales'.DS.$controller.DS.$lang.'.php')){
              require(AK_APP_DIR.DS.'locales'.DS.$controller.DS.$lang.'.php');
              $framework_dictionary[$controller.'_dictionary'] = (array)$dictionary;
-@@ -190,6 +195,8 @@
+@@ -193,6 +198,8 @@
  
          if(isset($controller) && isset($framework_dictionary[$controller.'_dictionary'][$string])){
              $string = $framework_dictionary[$controller.'_dictionary'][$string];
@@ -23,17 +23,17 @@
          }else {
              $string = isset($framework_dictionary[$string]) ? $framework_dictionary[$string] : $string;
          }
-@@ -351,7 +358,6 @@
+@@ -354,7 +361,6 @@
              if(!is_dir(dirname($options['base_path'].DS.$file_name))){
                  Ak::make_dir(dirname($options['base_path'].DS.$file_name), $options);
              }
 -
              if(!$result = file_put_contents($options['base_path'].DS.$file_name, $content)){
                  if(!empty($content)){
-                     Ak::trace("Please change file/dir permissions or enable FTP file handling by".
+                     Ak::trace("Could not write to file: \"".$options['base_path'].DS."$file_name\". Please change file/dir permissions or enable FTP file handling by".
 Index: lib/AkActionController.php
 ===================================================================
---- lib/AkActionController.php	(revision 834)
+--- lib/AkActionController.php	(revision 1030)
 +++ lib/AkActionController.php	(working copy)
 @@ -749,7 +749,14 @@
       */
@@ -63,7 +63,7 @@
  
 Index: lib/AkInstaller.php
 ===================================================================
---- lib/AkInstaller.php	(revision 834)
+--- lib/AkInstaller.php	(revision 1030)
 +++ lib/AkInstaller.php	(working copy)
 @@ -358,11 +358,13 @@
  
@@ -86,7 +86,7 @@
      }
 Index: lib/AkActionView/helpers/text_helper.php
 ===================================================================
---- lib/AkActionView/helpers/text_helper.php	(revision 834)
+--- lib/AkActionView/helpers/text_helper.php	(revision 1030)
 +++ lib/AkActionView/helpers/text_helper.php	(working copy)
 @@ -518,8 +518,18 @@
      */
@@ -111,9 +111,9 @@
      /**
 Index: lib/AkActiveRecord.php
 ===================================================================
---- lib/AkActiveRecord.php	(revision 834)
+--- lib/AkActiveRecord.php	(revision 1030)
 +++ lib/AkActiveRecord.php	(working copy)
-@@ -5013,6 +5013,7 @@
+@@ -4998,6 +4998,7 @@
  
          $sql .=  empty($options['joins']) ? '' : " {$options['joins']} ";
  
@@ -121,7 +121,7 @@
          empty($options['conditions']) ? null : $this->addConditions($sql, $options['conditions']);
  
          if (!empty($options['group'])){
-@@ -5023,6 +5024,11 @@
+@@ -5008,6 +5009,11 @@
          $sql .= empty($options['order']) ? '' : " ORDER BY {$options['order']} ";
          $this->_db->addLimitAndOffset($sql, $options);
          $sql .= $use_workaround ? ')' : '';


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