Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle

lib/outputlib.php

@@ -349,10 +349,10 @@ class theme_config {
     public $doctype = 'html5';
 
     /**
-     * @var string undeletableblocktypes If set to a string, will list the block types that cannot be deleted. Defaults to
+     * @var string requiredblocks If set to a string, will list the block types that cannot be deleted. Defaults to
      *                                   navigation and settings.
      */
-    public $undeletableblocktypes = false;
+    public $requiredblocks = false;
 
     //==Following properties are not configurable from theme config.php==
 
@@ -542,7 +542,7 @@ class theme_config {
         $configurable = array(
             'parents', 'sheets', 'parents_exclude_sheets', 'plugins_exclude_sheets',
             'javascripts', 'javascripts_footer', 'parents_exclude_javascripts',
-            'layouts', 'enable_dock', 'enablecourseajax', 'undeletableblocktypes',
+            'layouts', 'enable_dock', 'enablecourseajax', 'requiredblocks',
             'rendererfactory', 'csspostprocess', 'editor_sheets', 'rarrow', 'larrow', 'uarrow', 'darrow',
             'hidefromselector', 'doctype', 'yuicssmodules', 'blockrtlmanipulations',
             'lessfile', 'extralesscallback', 'lessvariablescallback', 'blockrendermethod',