Fix #6238 Return blank arrays

I committed this simple change to return the empty array rather than false for empty settings result for ElggPlugin::getAllSettings and getAllUsersSettings. Put this into 1.8 branch.

diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index 7bf6eb1df06fd6774d1c4a9e1cfffeb9e05d4442..81831d8cd44cab6432a080e471a025d3037e8780 100644 (file)
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -299,17 +299,16 @@ class ElggPlugin extends ElggObject {
 
                $private_settings = get_data($q);
 
+               $return = array();
+                
                if ($private_settings) {
-                       $return = array();
-
+               
                        foreach ($private_settings as $setting) {
                                $return[$setting->name] = $setting->value;
                        }
+                }
 
-                       return $return;
-               }
-
-               return false;
+               return $return;
        }
 
        /**
@@ -423,9 +422,10 @@ class ElggPlugin extends ElggObject {
 
                $private_settings = get_data($q);
 
-               if ($private_settings) {
-                       $return = array();
-
+               $return = array();
+               
+                if ($private_settings) {
+               
                        foreach ($private_settings as $setting) {
                                $name = substr($setting->name, $ps_prefix_len);
                                $value = $setting->value;
@@ -433,10 +433,9 @@ class ElggPlugin extends ElggObject {
                                $return[$name] = $value;
                        }
 
-                       return $return;
                }
 
-               return false;
+               return $return;
        }
 
        /**