Changeset 141:340bbc2cd9f4 for inc/core/class.dc.workspace.php

Timestamp:

05/04/11 15:52:51 (14 years ago)

Author:

xave <xave@…>

Branch:

userprefs

Message:

Deported the error handling found in constructors. Now we can upgrade.

File:

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

inc/core/class.dc.workspace.php

@@ -46 +46 @@
           $this->user_id =& $user_id;
           
-          $this->getPrefs($rs);
+          try {$this->getPrefs($rs);} catch (Exception $e) {
+               if (version_compare($core->getVersion('core'),'2.3','>')) {
+                    trigger_error($e->getMessage());
+               }
+          }
      }
      
@@ -63 +67 @@
                     $rs = $this->con->select($strReq);
                } catch (Exception $e) {
-                    trigger_error(__('Unable to retrieve prefs:').' '.$this->con->error(), E_USER_ERROR);
+                    //~ trigger_error(__('Unable to retrieve prefs:').' '.$this->con->error(), E_USER_ERROR);
+                    throw $e;
                }
           }