Commit: 1cdde2ebfbd07a2754a4890efe8e401b8e8be457
Author: Sara Golemon <[email protected]> Fri, 31 May 2019 12:46:16
-0400
Parents: c0afd74bf75f68d6939050fa0989e56aedaecacd
Branches: master
Link:
http://git.php.net/?p=web/php.git;a=commitdiff;h=1cdde2ebfbd07a2754a4890efe8e401b8e8be457
Log:
Swap uses of _SERVER[DOCUMENT_ROOT] for __DIR__
3/4 - Update archive directory.
Changed paths:
M archive/1998.php
M archive/1999.php
M archive/2000.php
M archive/2001.php
M archive/2002.php
M archive/2003.php
M archive/2004.php
M archive/2005.php
M archive/2006.php
M archive/2007.php
M archive/2008.php
M archive/2009.php
M archive/2010.php
M archive/2011.php
M archive/2012.php
M archive/2013.php
M archive/2014.php
M archive/2015.php
M archive/2016.php
M archive/2017.php
M archive/2018.php
M archive/2019.php
M archive/index.php
diff --git a/archive/1998.php b/archive/1998.php
index f03d40e..8f1febf 100644
--- a/archive/1998.php
+++ b/archive/1998.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/1998.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 1998", array("cache" => true));
?>
diff --git a/archive/1999.php b/archive/1999.php
index 05c2233..0a8ff6e 100644
--- a/archive/1999.php
+++ b/archive/1999.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/1999.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 1999", array("cache" => true));
?>
diff --git a/archive/2000.php b/archive/2000.php
index d9999d7..77eccbe 100644
--- a/archive/2000.php
+++ b/archive/2000.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2000.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2000", array("cache" => true));
?>
diff --git a/archive/2001.php b/archive/2001.php
index def291f..69cbf22 100644
--- a/archive/2001.php
+++ b/archive/2001.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2001.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2001", array("cache" => true));
?>
diff --git a/archive/2002.php b/archive/2002.php
index b048191..66830d3 100644
--- a/archive/2002.php
+++ b/archive/2002.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2002.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2002", array("cache" => true));
?>
diff --git a/archive/2003.php b/archive/2003.php
index 8814d6f..8a086ab 100644
--- a/archive/2003.php
+++ b/archive/2003.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2003.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2003", array("cache" => true));
?>
diff --git a/archive/2004.php b/archive/2004.php
index 7e087ef..0124c5c 100644
--- a/archive/2004.php
+++ b/archive/2004.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2004.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2004", array("cache" => true));
?>
diff --git a/archive/2005.php b/archive/2005.php
index f910f46..3fc7b87 100644
--- a/archive/2005.php
+++ b/archive/2005.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2005.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2005", array("cache" => true));
?>
diff --git a/archive/2006.php b/archive/2006.php
index 1a882be..e32887d 100644
--- a/archive/2006.php
+++ b/archive/2006.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2006.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2006", array("cache" => true));
?>
diff --git a/archive/2007.php b/archive/2007.php
index 9923d74..ef5810a 100644
--- a/archive/2007.php
+++ b/archive/2007.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2007.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2007", array("cache" => true));
?>
diff --git a/archive/2008.php b/archive/2008.php
index b2f5b21..e164880 100644
--- a/archive/2008.php
+++ b/archive/2008.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2008.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2008", array("cache" => true));
?>
diff --git a/archive/2009.php b/archive/2009.php
index 01cd361..e8f6389 100644
--- a/archive/2009.php
+++ b/archive/2009.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2009.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2009", array("cache" => true));
?>
diff --git a/archive/2010.php b/archive/2010.php
index 9476896..b2de42a 100644
--- a/archive/2010.php
+++ b/archive/2010.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2010.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2010", array("cache" => true));
?>
diff --git a/archive/2011.php b/archive/2011.php
index 701bc0b..72a97ff 100644
--- a/archive/2011.php
+++ b/archive/2011.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2011.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2011", array("cache" => true));
?>
diff --git a/archive/2012.php b/archive/2012.php
index 777449f..cfd9e0f 100644
--- a/archive/2012.php
+++ b/archive/2012.php
@@ -1,6 +1,6 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2012.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
news_archive_sidebar();
site_header("News Archive - 2012", array("cache" => true));
?>
diff --git a/archive/2013.php b/archive/2013.php
index 1f105e2..dbcaf2a 100644
--- a/archive/2013.php
+++ b/archive/2013.php
@@ -1,8 +1,8 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2013.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-news.inc';
+include_once __DIR__ . '/../include/prepend.inc';
+include_once __DIR__ . '/../include/pregen-news.inc';
news_archive_sidebar();
site_header("News Archive - 2013", array("cache" => true));
?>
diff --git a/archive/2014.php b/archive/2014.php
index f354cc0..bcd0820 100644
--- a/archive/2014.php
+++ b/archive/2014.php
@@ -1,8 +1,8 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2014.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-news.inc';
+include_once __DIR__ . '/../include/prepend.inc';
+include_once __DIR__ . '/../include/pregen-news.inc';
news_archive_sidebar();
site_header("News Archive - 2014", array("cache" => true));
?>
diff --git a/archive/2015.php b/archive/2015.php
index 3a40743..fe69c37 100644
--- a/archive/2015.php
+++ b/archive/2015.php
@@ -1,8 +1,8 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2015.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-news.inc';
+include_once __DIR__ . '/../include/prepend.inc';
+include_once __DIR__ . '/../include/pregen-news.inc';
news_archive_sidebar();
site_header("News Archive - 2015");
//site_header("News Archive - 2015", array("cache" => true));
diff --git a/archive/2016.php b/archive/2016.php
index bcdb3bc..8625a30 100644
--- a/archive/2016.php
+++ b/archive/2016.php
@@ -1,8 +1,8 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2016.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-news.inc';
+include_once __DIR__ . '/../include/prepend.inc';
+include_once __DIR__ . '/../include/pregen-news.inc';
news_archive_sidebar();
site_header("News Archive - 2016");
//site_header("News Archive - 2016", array("cache" => true));
diff --git a/archive/2017.php b/archive/2017.php
index 8900e66..cba9da8 100644
--- a/archive/2017.php
+++ b/archive/2017.php
@@ -1,8 +1,8 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2017.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-news.inc';
+include_once __DIR__ . '/../include/prepend.inc';
+include_once __DIR__ . '/../include/pregen-news.inc';
news_archive_sidebar();
site_header("News Archive - 2017");
//site_header("News Archive - 2017", array("cache" => true));
diff --git a/archive/2018.php b/archive/2018.php
index 678b395..b1723c0 100644
--- a/archive/2018.php
+++ b/archive/2018.php
@@ -1,8 +1,8 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2018.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-news.inc';
+include_once __DIR__ . '/../include/prepend.inc';
+include_once __DIR__ . '/../include/pregen-news.inc';
news_archive_sidebar();
site_header("News Archive - 2018");
//site_header("News Archive - 2018", array("cache" => true));
diff --git a/archive/2019.php b/archive/2019.php
index cd2700d..8c95dc8 100644
--- a/archive/2019.php
+++ b/archive/2019.php
@@ -1,8 +1,8 @@
<?php
$_SERVER['BASE_PAGE'] = 'archive/2019.php';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-news.inc';
+include_once __DIR__ . '/../include/prepend.inc';
+include_once __DIR__ . '/../include/pregen-news.inc';
news_archive_sidebar();
site_header("News Archive - 2019");
//site_header("News Archive - 2019", array("cache" => true));
diff --git a/archive/index.php b/archive/index.php
index 9d2762a..95d28ea 100644
--- a/archive/index.php
+++ b/archive/index.php
@@ -1,5 +1,5 @@
<?php
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once __DIR__ . '/../include/prepend.inc';
$i = 0;
do {
$y = date("Y")-$i;
@@ -9,5 +9,5 @@ do {
}
} while(++$i<3);
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/errors.inc';
+include_once __DIR__ . '/../include/errors.inc';
error_noservice();
--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
