Merge "Bug 1871473: Fixing 'sitedefault' page theme problem"

htdocs/lang/en.utf8/view.php

@@ -385,6 +385,7 @@ $string['noaccesstoview'] = 'You do not have permission to access this page.';
 $string['wrongblocktype'] = 'The ID supplied is not for a valid blocktype.';
 $string['changeviewtheme'] = 'The theme you have chosen for this page is no longer available to you. Please select a different theme.';
 $string['nothemeselected1'] = 'Use institution theme';
+$string['usesitetheme'] = 'Use site theme';
 
 // Templates
 $string['Template'] = 'Template';

htdocs/lib/mahara.php

@@ -777,7 +777,7 @@ function get_user_accessible_themes() {
         }
 
     }
-    $themes = array_merge(array('sitedefault' => get_string('nothemeselected1', 'view')), $themes);
+    $themes = array_merge(array('sitedefault' => get_string('usesitetheme', 'view')), $themes);
     unset($themes['custom']);
 
     return $themes;

htdocs/lib/web.php

@@ -1019,6 +1019,10 @@ class Theme {
                 $user->find_by_id($userid);
                 $themedata = $user->get_themedata();
                 $themedata->viewbasename = $themedata->basename;
+                if (empty($themedata->viewbasename) && !empty($themedata->altname)
+                    && $themedata->altname == 'sitedefault') {
+                    $themedata->viewbasename = get_config('theme');
+                }
                 unset($themedata->basename);
             }
         }

htdocs/view/editlayout.php

@@ -387,6 +387,8 @@ function get_advanced_elements() {
     // Theme dropdown
     $theme = $view->set_user_theme();
     $allowedthemes = get_user_accessible_themes();
+    $allowedthemes = array_merge(array('' => get_string('nothemeselected1', 'view')), $allowedthemes);
+
     if ($theme && !isset($allowedthemes[$theme])) {
         // We have page set with an unknown theme
         // So redirect it to the choose theme page first