diff options
author | Bharat Mediratta <bharat@menalto.com> | 2009-12-13 16:52:18 -0800 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2009-12-13 16:52:18 -0800 |
commit | c65cd702fc8e732416f13f4eb21c8e8e95b09c28 (patch) | |
tree | e264380ae453672d4f47386e24d84ce62f32e73c | |
parent | d5c35210b90565e7a6e79b86288b843b8e3b835e (diff) | |
parent | 7515b424e00831e9588a48ab46eca0405dde250f (diff) |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/helpers/identity.php
-rw-r--r-- | lib/gallery.common.css | 6 | ||||
-rw-r--r-- | modules/gallery/helpers/identity.php | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 5119bf79..87498b40 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -320,6 +320,7 @@ tr.g-warning td.g-warning { form .g-error { background-color: #fff; + padding-left: 20px; } .g-open { @@ -492,6 +493,7 @@ ul.sf-menu li li li.sfHover ul { /* Status and validation messages ~~~~ */ .g-message-block { + background-position: .4em .3em; border: 1px solid #ccc; padding: 0; } @@ -516,6 +518,10 @@ div#g-action-status { margin-bottom: 1em; } +.g-message { + background-position: 0 50%; +} + /* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-breadcrumbs { diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php index 05614559..707d1830 100644 --- a/modules/gallery/helpers/identity.php +++ b/modules/gallery/helpers/identity.php @@ -82,7 +82,8 @@ class identity_Core { } } catch (Exception $e) { // Log it, so we at least have so notification that we swallowed the exception. - Kohana_Log::add("error", "Load_user Exception: " . $e->__toString()); + Kohana_Log::add("error", "Load_user Exception: " . + $e->getMessage() . "\n" . $e->getTraceAsString()); try { Session::instance()->destroy(); } catch (Exception $e) { |