Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Simplified the way the 'real path' is resolved.

4.4.x
Dries Buytaert 2003-12-12 19:44:57 +00:00
parent ee92242333
commit f153bcb9bb
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
includes/common.inc
View File

@ -815,7 +815,13 @@ function drupal_get_path_alias($path) {
*/
function drupal_get_normal_path($path) {
$map = drupal_get_path_map();
return $map[$path];
if ($map[$path]) {
return $map[$path];
}
else {
return $path;
}
}
function url($url = NULL, $query = NULL) {
@ -945,17 +951,10 @@ header("Content-Type: text/html; charset=utf-8");
// initialize the _GET["q"] prior to loading the modules and invoking their 'init' hook:
if (!empty($_GET["q"])) {
if ($path = drupal_get_normal_path(trim($_GET["q"], "/"))) {
$_GET["q"] = $path;
}
$_GET["q"] = drupal_get_normal_path(trim($_GET["q"], "/"));
}
else {
if ($path = drupal_get_normal_path(variable_get("site_frontpage", "node"))) {
$_GET["q"] = $path;
}
else {
$_GET["q"] = variable_get("site_frontpage", "node");
}
$_GET["q"] = drupal_get_normal_path(variable_get("site_frontpage", "node"));
}
// initialize installed modules: