Changeset 141:340bbc2cd9f4

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.

Files:

• admin/index.php (modified) (1 diff)
• inc/core/class.dc.prefs.php (modified) (2 diffs)
• inc/core/class.dc.workspace.php (modified) (2 diffs)

admin/index.php

@@ -44 +44 @@
 
 # Check dashboard module prefs
-$core->auth->user_prefs->addWorkspace('dashboard');
+
+
+
 if (!$core->auth->user_prefs->dashboard->prefExists('doclinks')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('doclinks',true)) {

inc/core/class.dc.prefs.php

@@ -42 +42 @@
           $this->table = $core->prefix.'pref';
           $this->user_id =& $user_id;
-          $this->loadPrefs();
+          try {$this->loadPrefs();} catch (Exception $e) {
+               if (version_compare($core->getVersion('core'),'2.3','>')) {
+                    trigger_error($e->getMessage());
+               }
+          }
      }
      
@@ -59 +63 @@
                $rs = $this->con->select($strReq);
           } catch (Exception $e) {
-               trigger_error(__('Unable to retrieve workspaces:').' '.$this->con->error(), E_USER_ERROR);
+               //~ trigger_error(__('Unable to retrieve workspaces:').' '.$this->con->error(), E_USER_ERROR);
+               //~ throw new Exception(__('Unable to retrieve workspaces:').' '.$this->con->error(), E_USER_ERROR);
+               throw $e;
           }
           

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;
                }
           }