From: skodak <skodak>
Date: Sun, 23 Dec 2007 12:05:54 +0000 (+0000)
Subject: MDL-12717  use apply_default_exception_settings before other admin defaults; merged... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=bca13de752e4cbc951dbfc011b789c70638242ac;p=moodle.git

MDL-12717  use apply_default_exception_settings before other admin defaults; merged from MOODLE_19_STABLE
---

diff --git a/admin/index.php b/admin/index.php
index 3acda892a8..910e463ab1 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -202,10 +202,6 @@
             // install core event handlers
             events_update_definition();
 
-            // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
-            // (this should only have any effect during initial install).
-            admin_apply_default_settings(NULL, true);
-
             /// This is used to handle any settings that must exist in $CFG but which do not exist in
             /// admin_get_root()/$ADMIN as admin_setting objects (there are some exceptions).
             apply_default_exception_settings(array('auth' => 'email',
@@ -217,6 +213,10 @@
                                                    'theme' => 'standardwhite',
                                                    'filter_multilang_converted' => 1));
 
+            // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
+            // (this should only have any effect during initial install).
+            admin_apply_default_settings(NULL, true);
+
             notify($strdatabasesuccess, "green");
             require_once $CFG->dirroot.'/mnet/lib.php';
         } else {