Changeset 6238

Timestamp:

05/18/10 22:59:20 (3 years ago)

Author:

rvelices

Message:

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

Files:

• trunk/plugins/admin_multi_view/controller.php (modified) (1 diff)

trunk/plugins/admin_multi_view/controller.php

@@ -131 +131 @@
 $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"' : '';