com web/php: Revert "Un-taint the base tag with "./" things :)": include/site.inc
| From: | Paul Dragoonis | Date: | Thu, 21 Nov 2013 18:55:05 +0000 |
| Subject: | com web/php: Revert "Un-taint the base tag with "./" things :)": include/site.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-22485@lists.php.net to get a copy of this message | ||
Commit: e10faa76cb7e532433bf4bc19e7c4d38739b5d3d
Author: Hannes Magnusson <bjori@mongodb.com> Thu, 21 Nov 2013 10:55:05 -0800
Parents: 782788e0d0ad0149827a64663b311abe879604d4
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=e10faa76cb7e532433bf4bc19e7c4d38739b5d3d
Log:
Revert "Un-taint the base tag with "./" things :)"
This reverts commit 0bc5a56ab751f5a6c98f1ebca4df8964207e99ae.
Changed paths:
M include/site.inc
Diff:
diff --git a/include/site.inc b/include/site.inc
index 1639ddd..3137fc8 100644
--- a/include/site.inc
+++ b/include/site.inc
@@ -553,10 +553,7 @@ 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']) . "/";
- if ($dirname == "./") {
- $dirname = "";
- }
- $_SERVER['BASE_HREF'] = $MYSITE . $dirname;
+ $dirname = dirname($_SERVER['BASE_PAGE']);
+ $_SERVER['BASE_HREF'] = $MYSITE . $dirname . "/";
} else { unset($_SERVER['BASE_HREF']); }