Changeset 879:0f41872a14e9 for inc/core

Timestamp:

08/21/12 10:09:36 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

fixed settings loading...

File:

• inc/core/class.dc.namespace.php (modified) (4 diffs)

inc/core/class.dc.namespace.php

@@ -49 +49 @@
      }
      
-     private function getSettings($settings=null)
+     private function getSettings($rs=null)
      {    
-          if ($settings == null) {
+          if ($rs == null) {
                $strReq = 'SELECT blog_id, setting_id, setting_value, '.
                          'setting_type, setting_label, setting_ns '.
@@ -61 +61 @@
           
                try {
-                    $settings = $this->con->select($strReq);
+                    $rs = $this->con->select($strReq);
                } catch (Exception $e) {
                     trigger_error(__('Unable to retrieve settings:').' '.$this->con->error(), E_USER_ERROR);
                }
           }
-          foreach ($settings as $s)
-          {
-               if ($s->f('setting_ns') != $this->ns){
+          while ($rs->fetch())
+          {
+               if ($rs->f('setting_ns') != $this->ns){
                     break;
                }
-               $id = trim($s->f('setting_id'));
-               $value = $s->f('setting_value');
-               $type = $s->f('setting_type');
+               $id = trim($rs->f('setting_id'));
+               $value = $rs->f('setting_value');
+               $type = $rs->f('setting_type');
                
                if ($type == 'float' || $type == 'double') {
@@ -83 +83 @@
                settype($value,$type);
                
-               $array = $s->blog_id ? 'local' : 'global';
+               $array = $rs->blog_id ? 'local' : 'global';
                
                $this->{$array.'_settings'}[$id] = array(
@@ -89 +89 @@
                     'value' => $value,
                     'type' => $type,
-                    'label' => (string) $s->f('setting_label'),
-                    'global' => $s->blog_id == ''
+                    'label' => (string) $rs->f('setting_label'),
+                    'global' => $rs->blog_id == ''
                );
           }