cvs: phpweb /include layout.inc

bjori Fri May 8 07:26:30 2009 UTC Modified files: /phpweb/include layout.inc Log: Don't overwrite the static root if its already set (by auto_prepend fx) http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.305&r2=1.306&diff_format=u Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.305 phpweb/include/layout.inc:1.306 --- phpweb/include/layout.inc:1.305 Wed May 6 18:40:49 2009 +++ phpweb/include/layout.inc Fri May 8 07:26:30 2009 @@ -1,9 +1,12 @@ <?php -/* $Id: layout.inc,v 1.305 2009/05/06 18:40:49 philip Exp $ */ +/* $Id: layout.inc,v 1.306 2009/05/08 07:26:30 bjori Exp $ */ // Set the static content root differently on php.net -$_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ? - 'http://static.php.net/www.php.net' : ''; +if ($MYSITE == "http://www.php.net/") { + $_SERVER['STATIC_ROOT'] = 'http://static.php.net/www.php.net'; +} elseif (!isset($_SERVER['STATIC_ROOT'])) { + $_SERVER['STATIC_ROOT'] = ""; +} // Use class names instead of colors ini_set('highlight.comment', 'comment');