reverting bad commit, sorry

2008-01-13 18:55:47 +00:00
parent f4687e66e7
commit 74ec307700
1 changed files with 0 additions and 5 deletions
@@ -21,7 +21,6 @@ $PAGE->init_extra($section); // hack alert!
 $adminediting = optional_param('adminedit', -1, PARAM_BOOL);
 $return       = optional_param('return','', PARAM_ALPHA);

-<<<<<<< settings.php
 if (!isset($USER->adminediting)) {
    $USER->adminediting = false;
 }
@@ -35,10 +34,6 @@ if ($PAGE->user_allowed_editing()) {
 }

 $adminroot = admin_get_root();
-=======
-/// no guest autologin
-require_login(0, false);
->>>>>>> 1.40.2.3

 $root = $adminroot->locate($PAGE->section);