summaryrefslogtreecommitdiff
path: root/modules/system
diff options
context:
space:
mode:
Diffstat (limited to 'modules/system')
-rw-r--r--modules/system/system.admin.inc4
-rw-r--r--modules/system/system.module9
2 files changed, 2 insertions, 11 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 0f98ef355..37d1fc2a0 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -184,7 +184,7 @@ function system_settings_overview() {
db_check_setup();
}
- $item = menu_get_item('admin/settings');
+ $item = menu_get_item('admin/config');
$content = system_admin_menu_block($item);
$output = theme('admin_block_content', $content);
@@ -1417,7 +1417,7 @@ function system_performance_settings() {
$disabled = !$is_writable;
$disabled_message = '';
if(!$is_writable) {
- $disabled_message = ' ' . t('<strong class="error">Please set up the <a href="!file-system">public files directory</a> to make these optimizations available.</strong>', array('!file-system' => url('admin/settings/file-system')));
+ $disabled_message = ' ' . t('<strong class="error">Please set up the <a href="!file-system">public files directory</a> to make these optimizations available.</strong>', array('!file-system' => url('admin/config/media/file-system')));
}
$form['bandwidth_optimization'] = array(
diff --git a/modules/system/system.module b/modules/system/system.module
index ff4cf4ed3..7d04cffa9 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -534,15 +534,6 @@ function system_menu() {
);
// Menu items that are basically just menu blocks.
- $items['admin/settings'] = array(
- 'title' => 'Site configuration',
- 'description' => 'Configure site settings.',
- 'position' => 'right',
- 'weight' => -2,
- 'page callback' => 'system_settings_overview',
- 'access arguments' => array('access administration pages'),
- 'file' => 'system.admin.inc',
- );
$items['admin/structure'] = array(
'title' => 'Structure',
'description' => 'Control how your site looks and feels.',