summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-12-17 13:10:19 +0000
committerDries Buytaert <dries@buytaert.net>2009-12-17 13:10:19 +0000
commitf3710830c4ce624f2212b19228859d091e6c7ad6 (patch)
tree25683c69715a00100a4a9f8fd89ad97fce85565f /modules
parentcaa214f17c5a9d441e6a2ac0ec129c0d6068b2cb (diff)
downloadbrdo-f3710830c4ce624f2212b19228859d091e6c7ad6.tar.gz
brdo-f3710830c4ce624f2212b19228859d091e6c7ad6.tar.bz2
- Patch #190867 by chx: fixed access to creating path aliases.
Diffstat (limited to 'modules')
-rw-r--r--modules/menu/menu.admin.inc2
-rw-r--r--modules/path/path.admin.inc3
-rw-r--r--modules/system/system.admin.inc3
3 files changed, 3 insertions, 5 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 5522e5f93..2eb644f23 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -363,7 +363,7 @@ function menu_edit_item_validate($form, &$form_state) {
$item['link_path'] = $parsed_link['path'];
}
}
- if (!trim($item['link_path']) || !menu_valid_path($item)) {
+ if (!trim($item['link_path']) || !drupal_valid_path($item['link_path'], TRUE)) {
form_set_error('link_path', t("The path '@link_path' is either invalid or you do not have access to it.", array('@link_path' => $item['link_path'])));
}
}
diff --git a/modules/path/path.admin.inc b/modules/path/path.admin.inc
index 94fbf5d4c..ba7586cd1 100644
--- a/modules/path/path.admin.inc
+++ b/modules/path/path.admin.inc
@@ -163,8 +163,7 @@ function path_admin_form_validate($form, &$form_state) {
if ($has_alias) {
form_set_error('alias', t('The alias %alias is already in use in this language.', array('%alias' => $alias)));
}
- $item = menu_get_item($source);
- if (!$item || !$item['access']) {
+ if (!drupal_valid_path($source)) {
form_set_error('source', t("The path '@link_path' is either invalid or you do not have access to it.", array('@link_path' => $source)));
}
}
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 1d326da95..3073f62e2 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1483,8 +1483,7 @@ function system_site_information_settings_validate($form, &$form_state) {
// Get the normal path of the front page.
form_set_value($form['site_frontpage'], drupal_get_normal_path($form_state['values']['site_frontpage']), $form_state);
// Validate front page path.
- $item = array('link_path' => $form_state['values']['site_frontpage']);
- if (!menu_valid_path($item)) {
+ if (!drupal_valid_path($form_state['values']['site_frontpage'])) {
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'])));
}
}