[geeklog-cvs] geeklog: Merged changes from geeklog_1_8_0_1 branch

[geeklog-cvs at lists.geeklog.net]

changeset 8433:58b419c9867c
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/58b419c9867c
user: Dirk Haun <dirk at haun-online.de>
date: Mon Oct 03 08:44:25 2011 +0200
description:
Merged changes from geeklog_1_8_0_1 branch

diffstat:

 public_html/lib-common.php      |   2 +-
 system/classes/config.class.php |  25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diffs (50 lines):

diff -r f612dc8ba5b3 -r 58b419c9867c public_html/lib-common.php
--- a/public_html/lib-common.php	Thu Sep 29 14:08:06 2011 -0400
+++ b/public_html/lib-common.php	Mon Oct 03 08:44:25 2011 +0200
@@ -7154,7 +7154,7 @@
     $blankField = false;
     while(list($key, $value) = each($array)) {
         $lkey = strtolower($key);
-        if((strpos($lkey, 'pass') !== false) || (strpos($lkey, 'cookie') !== false)) {
+        if((strpos($lkey, 'pass') !== false) || (strpos($lkey, 'cookie') !== false) || (strpos($lkey, '_consumer_key') !== false) || (strpos($lkey, '_consumer_secret') !== false)) {
             $blankField = true;
         } else {
             $blankField = $blank;
diff -r f612dc8ba5b3 -r 58b419c9867c system/classes/config.class.php
--- a/system/classes/config.class.php	Thu Sep 29 14:08:06 2011 -0400
+++ b/system/classes/config.class.php	Mon Oct 03 08:44:25 2011 +0200
@@ -1322,22 +1322,21 @@
                 } else if ( is_array($change_array[$param_name]) ) {
                     /* if array such as mail settings */
                     $_changed = false;
-                    if (count($this->config_array[$group][$param_name]) !=
-                            count($change_array[$param_name])) {
+                    if (count($this->config_array[$group][$param_name]) !=  count($change_array[$param_name])) {
                         $_changed = true;
                     }
                     foreach ( $change_array[$param_name] as $_param_name => $_param_value ) {
-                        if  ( $change_array[$param_name][$_param_name] != 
-                              $this->config_array[$group][$param_name][$_param_name] )
-                        {
-                            $_changed = true;
-                            if ( $this->_validates($param_name . '[' . $_param_name . ']', 
-                                 $group, $change_array[$param_name][$_param_name], $change_array[$param_name]) )
-                            {
-                                $this->changedArray[$group][$param_name][$_param_name] = true;
-                            }
-                        }
-                    }
+                         if (!isset($this->config_array[$group][$param_name][$_param_name])) {
+                             $_changed = true;
+                         } elseif ( $change_array[$param_name][$_param_name] != $this->config_array[$group][$param_name][$_param_name] ) {
+                             $_changed = true;
+                         }
+                         if ($_changed) {
+                             if ( $this->_validates($param_name . '[' . $_param_name . ']', $group, $change_array[$param_name][$_param_name], $change_array[$param_name]) ) {
+                                 $this->changedArray[$group][$param_name][$_param_name] = true;
+                             }
+                         }
+                     }
                     
                     if ( $_changed ) {
                         $pass_validation[$param_name] = $change_array[$param_name];