Feature 1502: Fix admin multi view plugin.

git-svn-id: http://piwigo.org/svn/trunk@5128 68402e56-0260-453c-a942-63ccdbb3a9ee

Author: patdenice

plugins/admin_multi_view/controller.php

@@ -128,17 +128,17 @@
 
 // +-----------------------------------------------------------------------+
 // | templates                                                             |
-$my_template = '';
+$my_theme = '';
 $themes_html='<select onchange="document.location = this.options[this.selectedIndex].value;">';
-foreach (get_pwg_themes() as $pwg_template)
+foreach (get_pwg_themes() as $pwg_theme)
 {
-  $selected = $pwg_template == pwg_get_session_var( 'multiview_theme', $view_as_user['template'].'/'.$view_as_user['theme'] ) ? 'selected="selected"' : '';
-  $my_template = $selected == '' ? $my_template : $view_as_user['template'].'/theme/'.$view_as_user['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'];
   $themes_html .=
     '<option value="'
-    .$my_url.'?theme='.$pwg_template
+    .$my_url.'?theme='.$pwg_theme
     .'" '.$selected.'>'
-    .$pwg_template
+    .$pwg_theme
     .'</option>';
 }
 $themes_html .= '</select>';
@@ -206,9 +206,9 @@
 <title>Controller</title>
 <?php
 // Controller will be displayed  with  the **real admin template** (without Any if it has been removed)
-if ( $my_template !== '') {
-  $my_template = get_root_url().'template/'.$my_template.'/theme.css';
-  echo '<link rel="stylesheet" type="text/css" href="' . $my_template .'">';
+if ( $my_theme !== '') {
+  $my_theme = get_root_url().$my_theme.'/theme.css';
+  echo '<link rel="stylesheet" type="text/css" href="' . $my_theme .'">';
 }
 ?>
 

plugins/admin_multi_view/is_admin.inc.php

@@ -10,8 +10,8 @@
   $theme = pwg_get_session_var( 'multiview_theme', '' );
   if ( !empty($theme) )
   {
-    list($user['template'], $user['theme']) = explode('/', $theme);
-    unset( $user['admin_template'], $user['admin_theme']);
+    $user['theme'] = $theme;
+    unset($user['admin_theme']);
   }
   $lang = pwg_get_session_var( 'multiview_lang', '' );
   if ( !empty($lang) )