com web/php: Revert "Remove the filename from BASE_HREF ( used for <base />), fixes bug#6613 8": include/shared-manual.inc include/site.inc

Commit: 9050dae5abafb1937ff04be1c888e54b08a6a6ec Author: Hannes Magnusson <bjori@mongodb.com> Thu, 21 Nov 2013 10:55:09 -0800 Parents: eec766fe11029a9ad16ebe049f7aeff8a3c95447 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=9050dae5abafb1937ff04be1c888e54b08a6a6ec Log: Revert "Remove the filename from BASE_HREF (used for <base />), fixes bug#66138" This reverts commit cc3a7dccac0b1723b2778414aea89cde1c62e506. Bugs: https://bugs.php.net/66138 Changed paths: M include/shared-manual.inc M include/site.inc Diff: diff --git a/include/shared-manual.inc b/include/shared-manual.inc index c44d6de..1a78b01 100644 --- a/include/shared-manual..inc +++ b/include/shared-manual.inc @@ -335,9 +335,8 @@ function manual_setup($setup) { global $PGI, $MYSITE; $PGI = $setup; // Set base href for this manual page - $dirname = 'manual/' . language_convert($setup['head'][1]); - $_SERVER['BASE_PAGE'] = $dirname . "/" . $setup['this'][0]; - $_SERVER['BASE_HREF'] = $MYSITE . $dirname . "/"; + $_SERVER['BASE_PAGE'] = 'manual/' . language_convert($setup['head'][1]) . "/" . $setup['this'][0]; + $_SERVER['BASE_HREF'] = $MYSITE . $_SERVER['BASE_PAGE']; $siblings = array(); diff --git a/include/site.inc b/include/site.inc index 3137fc8..c930534 100644 --- a/include/site.inc +++ b/include/site.inc @@ -553,7 +553,6 @@ if (isset($_SERVER['MIRROR_STATS'])) { // Provide base href information to make relative links on // shortcut URL accessed pages work without redirection if (isset($_SERVER['BASE_PAGE'])) { - $dirname = dirname($_SERVER['BASE_PAGE']); - $_SERVER['BASE_HREF'] = $MYSITE . $dirname . "/"; + $_SERVER['BASE_HREF'] = $MYSITE . $_SERVER['BASE_PAGE']; } else { unset($_SERVER['BASE_HREF']); }