summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-07-08 07:53:16 +0000
committerDries Buytaert <dries@buytaert.net>2009-07-08 07:53:16 +0000
commit0274ab3454ecae4df8bee88cccc7588867d7e909 (patch)
treec39a639236e8eda4eaef8b45084ce5153ead263f
parent018cc32777bbd09a02b80d72aee89f9741a50153 (diff)
downloadbrdo-0274ab3454ecae4df8bee88cccc7588867d7e909.tar.gz
brdo-0274ab3454ecae4df8bee88cccc7588867d7e909.tar.bz2
- Patch #497590 by Dave Reid: remove pointless 'system paths only' warning from admin/settings/site-information.
-rw-r--r--modules/system/system.admin.inc9
1 files changed, 2 insertions, 7 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 420983073..786e560fa 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1255,13 +1255,8 @@ function system_site_information_settings_validate($form, &$form_state) {
form_set_error('site_mail', $error);
}
// Validate front page path.
- $item = array('link_path' => $form_state['values']['site_frontpage']);
- $normal_path = drupal_get_normal_path($item['link_path']);
- if ($item['link_path'] != $normal_path) {
- drupal_set_message(t('The menu system stores system paths only, but will use the URL alias for display. %link_path has been stored as %normal_path', array('%link_path' => $item['link_path'], '%normal_path' => $normal_path)));
- $item['link_path'] = $normal_path;
- }
- if (!empty($item) && !menu_valid_path($item)) {
+ $item = array('link_path' => drupal_get_normal_path($form_state['values']['site_frontpage']));
+ if (!menu_valid_path($item)) {
form_set_error('site_frontpage', t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $item['link_path'])));
}
}