Changeset 880:02c78f56f430

Timestamp:

08/22/12 09:06:05 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

fixed same regression as in namespaces...

File:

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

inc/core/class.dc.workspace.php

@@ -53 +53 @@
      }
      
-     private function getPrefs($settings=null)
+     private function getPrefs($rs=null)
      {    
-          if ($settings == null) {
+          if ($rs == null) {
                $strReq = 'SELECT user_id, pref_id, pref_value, '.
                          'pref_type, pref_label, pref_ws '.
@@ -65 +65 @@
           
                try {
-                    $settings = $this->con->select($strReq);
+                    $rs = $this->con->select($strReq);
                } catch (Exception $e) {
                     throw $e;
                }
           }
-          foreach ($settings as $s)
-          {
-               if ($s->f('pref_ws') != $this->ws){
+          while ($rs->fetch())
+          {
+               if ($rs->f('pref_ws') != $this->ws){
                     break;
                }
-               $id = trim($s->f('pref_id'));
-               $value = $s->f('pref_value');
-               $type = $s->f('pref_type');
+               $id = trim($rs->f('pref_id'));
+               $value = $rs->f('pref_value');
+               $type = $rs->f('pref_type');
                
                if ($type == 'float' || $type == 'double') {
@@ -87 +87 @@
                settype($value,$type);
                
-               $array = $s->user_id ? 'local' : 'global';
+               $array = $rs->user_id ? 'local' : 'global';
                
                $this->{$array.'_prefs'}[$id] = array(
@@ -93 +93 @@
                     'value' => $value,
                     'type' => $type,
-                    'label' => (string) $s->f('pref_label'),
-                    'global' => $s->user_id == ''
+                    'label' => (string) $rs->f('pref_label'),
+                    'global' => $rs->user_id == ''
                );
           }