Changeset 147:421794608368 for inc

Timestamp:

05/04/11 17:05:49 (14 years ago)

Author:

xave <xave@…>

Branch:

userprefs

Children:

148:a5ffa124056c, 154:b948351eb8c9

Message:

Gosh, that was dirty.

Location:

inc/core

Files:

• class.dc.prefs.php (modified) (2 diffs)
• class.dc.workspace.php (modified) (2 diffs)

inc/core/class.dc.prefs.php

@@ -44 +44 @@
           try {$this->loadPrefs();} catch (Exception $e) {
                if (version_compare($core->getVersion('core'),'2.3','>')) {
-                    trigger_error($e->getMessage());
+                    trigger_error(__('Unable to retrieve workspaces:').' '.$this->con->error(), E_USER_ERROR);
                }
           }
@@ -63 +63 @@
                $rs = $this->con->select($strReq);
           } catch (Exception $e) {
-               //~ 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

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