Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle

theme/base/config.php

@@ -153,12 +153,18 @@ $THEME->layouts = array(
         'regions' => array(),
         'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
     ),
-    // The pagelayout used for reports
+    // The pagelayout used for reports.
     'report' => array(
         'file' => 'report.php',
         'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
     ),
+    // The pagelayout used for safebrowser and securewindow.
+    'secure' => array(
+        'file' => 'general.php',
+        'regions' => array(),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nologinlinks'=>true),
+    ),
 );
 
 // We don't want the base theme to be shown on the theme selection screen, by setting

theme/upgrade.txt

@@ -1,6 +1,11 @@
 This files describes API changes in /theme/* themes,
 information provided here is intended especially for theme designer.
 
+=== 2.4 ===
+
+optional changes:
+* new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365)
+* new layout option "nologinlinks" and new page layout "secure" e.g. for safebrowser and securewindow (MDL-31365)
 
 === 2.3 ===
 
@@ -12,4 +17,4 @@ optional changes:
 required changes:
 * use new page content placeholder "echo $OUTPUT->main_content()" instead of "echo core_renderer::MAIN_CONTENT_TOKEN"
   see git commit: 3b3f302855d7621405a8b93e49bd399d67a998d7
-* upgrade report selectors: search for "-course-report-" and replace with "-report-"
+* upgrade report selectors: search for "-course-report-" and replace with "-report-"