diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-05-18 20:59:20 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-05-18 20:59:20 +0000 |
| commit | 1c424bb8f30e2ffa306127e91d2c252f763f8027 (patch) | |
| tree | 16783dbb2e3dc5221cb4c58be4b4f156ab798c29 | |
| parent | 516496070ee9831b5b5dcb6b8837025667186f34 (diff) | |
merge -r6236 from branch 2.1 (some odd stuff is going on - I couldn't use svn for merging ... had to do it manually)
multi view plugin can select inactive themes
git-svn-id: http://piwigo.org/svn/trunk@6238 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | plugins/admin_multi_view/controller.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/admin_multi_view/controller.php b/plugins/admin_multi_view/controller.php index 524fca747..8934ec451 100644 --- a/plugins/admin_multi_view/controller.php +++ b/plugins/admin_multi_view/controller.php @@ -130,7 +130,9 @@ $users_html.= '</select>'; // | templates | $my_theme = ''; $themes_html='<select onchange="document.location = this.options[this.selectedIndex].value;">'; -foreach (get_pwg_themes() as $pwg_theme) +include_once(PHPWG_ROOT_PATH.'admin/include/themes.class.php'); +$themes = new themes(); +foreach ($themes->fs_themes as $pwg_theme => $fs_theme) { $selected = $pwg_theme == pwg_get_session_var( 'multiview_theme', $view_as_user['theme'] ) ? 'selected="selected"' : ''; $my_theme = $selected == '' ? $my_theme : 'themes/'.$view_as_user['theme']; |