svn: /web/php/trunk/ error.php

philip Thu, 07 Apr 2011 15:19:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=310012 Log: Hack to stop the manual/lang to manual/en/lang redirects for inactive langs, via help-translate.php Changed paths: U web/php/trunk/error.php Modified: web/php/trunk/error.php =================================================================== --- web/php/trunk/error.php 2011-04-07 14:52:30 UTC (rev 310011) +++ web/php/trunk/error.php 2011-04-07 15:19:04 UTC (rev 310012) @@ -14,6 +14,7 @@ // Ensure that our environment is set up include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; +include_once $_SERVER['DOCUMENT_ROOT'] . '/include/languages.inc'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/loadavg.inc'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/errors.inc'; @@ -78,8 +79,11 @@ // ============================================================================ // BC: handle moving english manual down into its own directory (also supports // default language manual accessibilty on mirror sites through /manual/filename) -if (preg_match("!^manual(/[^/]*)$!", $URI, $array)) { - mirror_redirect("/manual/$LANG$array[1]"); +// @todo do we rely on this? how about removing it... +if (preg_match("!^manual/([^/]*)$!", $URI, $array)) { + if (!isset($INACTIVE_ONLINE_LANGUAGES[$array[1]])) { + mirror_redirect("/manual/$LANG/$array[1]"); + } } elseif (preg_match("!^manual/html/([^/]+)$!", $URI, $array)) { $array[1] = preg_replace("!.html$!", ".php", $array[1]); mirror_redirect("/manual/$LANG/$array[1]");