summaryrefslogtreecommitdiff
path: root/includes/menu.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-11-19 20:35:31 +0000
committerDries Buytaert <dries@buytaert.net>2010-11-19 20:35:31 +0000
commit203b6a88b2666352f2ed5d241b4ad738fde1e9bd (patch)
tree338c2036c2fc84db297110e3775bb110b0cef002 /includes/menu.inc
parent2b2f2796ce6553ce9b83735eab12afb5f5a4f0c7 (diff)
downloadbrdo-203b6a88b2666352f2ed5d241b4ad738fde1e9bd.tar.gz
brdo-203b6a88b2666352f2ed5d241b4ad738fde1e9bd.tar.bz2
- Patch #944198 by sun: functions that call drupal_system_listing() act on potentially invalid system items.
Diffstat (limited to 'includes/menu.inc')
-rw-r--r--includes/menu.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index 9eb248c1b..9d3fef979 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -3309,8 +3309,7 @@ function _menu_router_build($callbacks) {
$match = FALSE;
// Look for wildcards in the form allowed to be used in PHP functions,
// because we are using these to construct the load function names.
- // See http://php.net/manual/en/language.functions.php for reference.
- if (preg_match('/^%(|[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$/', $part, $matches)) {
+ if (preg_match('/^%(|' . DRUPAL_PHP_FUNCTION_PATTERN . ')$/', $part, $matches)) {
if (empty($matches[1])) {
$match = TRUE;
$load_functions[$k] = NULL;