diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-23 19:58:15 -0700 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-23 19:58:15 -0700 |
commit | cdf5a4fcbf8ccbe90b0d2a41d08e8dc65626f305 (patch) | |
tree | c2f083f347305ed92e52d8213f258cd7521c034e /modules/gallery/helpers/gallery_event.php | |
parent | 8d430259fe641f2680eeacad519744de1d02aac4 (diff) | |
parent | 68411cc903a1fedd5014763f55f3925c5a971b0f (diff) |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/helpers/gallery_event.php
Diffstat (limited to 'modules/gallery/helpers/gallery_event.php')
-rw-r--r-- | modules/gallery/helpers/gallery_event.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index b6afa2c8..91f3e717 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -23,7 +23,8 @@ class gallery_event_Core { * Initialization. */ static function gallery_ready() { - identity::load_user(); + theme::load_themes(Input::instance()->server("PATH_INFO")); + user::load_user(); locales::set_request_locale(); } |