--- moodle-1.7/lib/blocklib.php 2006-10-26 14:55:24.000000000 +0100
+++ moodle-1.7-changed/lib/blocklib.php    2006-12-04 17:23:49.000000000 +0000
@@ -871,7 +871,7 @@
     }
 }
 
-function blocks_repopulate_page($page) {
+function blocks_repopulate_page($page, $respect_override = true) {
     global $CFG;
 
     $allblocks = blocks_get_record();
@@ -887,8 +887,8 @@
     }
 
     /// If the site override has been defined, it is the only valid one.
-    if (!empty($CFG->defaultblocks_override)) {
-        $blocknames = $CFG->defaultblocks_override;
+    if ( $respect_override and ( !empty($CFG->defaultblocks_override) ) ) {
+       $blocknames = $CFG->defaultblocks_override;
     }
     else {
         $blocknames = $page->blocks_get_default();

--- moodle-1.7/admin/index.php  2006-10-26 14:55:30.000000000 +0100
+++ moodle-1.7-changed/admin/index.php     2006-12-04 17:26:20.000000000 +0000
@@ -375,7 +375,8 @@
         require_once($CFG->libdir.'/blocklib.php');
         page_map_class(PAGE_ADMIN, 'page_admin');
         $page = page_create_object(PAGE_ADMIN, 0); // there must be some id number
-        blocks_repopulate_page($page);
+
+        blocks_repopulate_page($page, false);
 
         //add admin_tree block to site if not already present
         if ($admintree = get_record('block', 'name', 'admin_tree')) {