cvs: phpweb /include prepend.inc site.inc

rasmus Tue Feb 21 20:46:45 2006 UTC Modified files: /phpweb/include prepend.inc site.inc Log: These are the two most accessed file. Remove the bad habit of always using include_once when all of these files are only ever included from here and these files themselves are only ever included once. http://cvs.php.net/viewcvs.cgi/phpweb/include/prepend.inc?r1=1.33&r2=1.34&diff_format=u Index: phpweb/include/prepend.inc diff -u phpweb/include/prepend.inc:1.33 phpweb/include/prepend.inc:1.34 --- phpweb/include/prepend.inc:1.33 Fri Dec 24 10:43:50 2004 +++ phpweb/include/prepend.inc Tue Feb 21 20:46:45 2006 @@ -1,6 +1,6 @@ <?php // -*- C++ -*- -// $Id: prepend.inc,v 1.33 2004/12/24 10:43:50 goba Exp $ +// $Id: prepend.inc,v 1.34 2006/02/21 20:46:45 rasmus Exp $ // See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9 // for cache control header descriptions (used in many places on the site). @@ -26,21 +26,21 @@ $MQ = (boolean) get_magic_quotes_gpc(); // Site details (mirror site information) -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/site.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/site.inc'; // Choose language used for translated parts -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/langchooser.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/langchooser.inc'; // Get country of the user and set it in a cookie -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/ip-to-country.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/ip-to-country.inc'; // Common layout functions -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/layout.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/layout.inc'; // This file is generated on rsync.php.net and propagated // from there. It just defines $LAST_UPDATED, which is the // mirror's last updated time. -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/last_updated.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/last_updated.inc'; // Function used to import request vars to global scope. // Walks through $array, and imports all values associated http://cvs.php.net/viewcvs.cgi/phpweb/include/site.inc?r1=1.254&r2=1.255&diff_format=u Index: phpweb/include/site.inc diff -u phpweb/include/site.inc:1.254 phpweb/include/site.inc:1.255 --- phpweb/include/site.inc:1.254 Tue May 10 09:03:53 2005 +++ phpweb/include/site.inc Tue Feb 21 20:46:45 2006 @@ -1,15 +1,15 @@ <?php // -*- C++ -*- -// $Id: site.inc,v 1.254 2005/05/10 09:03:53 sniper Exp $ +// $Id: site.inc,v 1.255 2006/02/21 20:46:45 rasmus Exp $ // Define $MIRRORS array, and some constants -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/mirrors.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/mirrors.inc'; // Define $COUNTRIES array -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/countries.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/countries.inc'; // Define $LANGUAGES array -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/languages.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/languages.inc'; // Returns true if the current (or specified) // site is the primary mirror site