cvs: phpweb / index.php /include layout.inc

goba Wed Sep 6 21:28:26 2006 UTC Modified files: /phpweb index.php /phpweb/include layout.inc Log: fix up onload handling and an image title http://cvs.php.net/viewvc.cgi/phpweb/index.php?r1=1.808&r2=1.809&diff_format=u Index: phpweb/index.php diff -u phpweb/index.php:1.808 phpweb/index.php:1.809 --- phpweb/index.php:1.808 Wed Sep 6 14:03:38 2006 +++ phpweb/index.php Wed Sep 6 21:28:26 2006 @@ -140,7 +140,7 @@ $RSIDEBAR_DATA = $MIRROR_IMAGE . $RSIDEBAR_DATA; // Run the boldEvents() function on page load -$ONLOAD = "boldEvents(); searchHistory();"; +$ONLOAD = "boldEvents();"; // Write out common header commonHeader("Hypertext Preprocessor"); @@ -148,7 +148,7 @@ // DO NOT REMOVE THIS COMMENT (the RSS parser is dependant on it) ?> -<?php news_image("http://dcphpconference.com/", "dcphpconference.png", "2006 DC PHP Conference - Speakers and schedule"); ?> +<?php news_image("http://dcphpconference.com/", "dcphpconference.png", "2006 DC PHP Conference"); ?> <h1>2006 DC PHP Conference - Speakers and schedule</h1> <p> http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.237&r2=1.238&diff_format=u Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.237 phpweb/include/layout.inc:1.238 --- phpweb/include/layout.inc:1.237 Wed Sep 6 16:57:09 2006 +++ phpweb/include/layout.inc Wed Sep 6 21:28:26 2006 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.237 2006/09/06 16:57:09 goba Exp $ */ +/* $Id: layout.inc,v 1.238 2006/09/06 21:28:26 goba Exp $ */ // Set the static content root differently on php.net $_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ? @@ -425,8 +425,7 @@ global $MYSITE, $base, $enclosed, $EXPL_LANG, $SIDEBAR_DATA, $SEARCH_BASE, $ONLOAD; - // If no onload event is specified, restore the last search - if (empty($ONLOAD)) { $ONLOAD = "runOnLoad();"; } + $onload = ($ONLOAD ? ' onload="' . $ONLOAD . '"' : ''); // Guess what base to use for this page (the first two are just // for BC reasons, until we migrate all the code to use the last one) @@ -454,7 +453,7 @@ <?php echo (isset($PBASE) ? ' <base href="' . $PBASE . '" />' : ''); ?></head> <body bgcolor="#ffffff" text="#000000" link="#000099" alink="#0000ff" vlink="#000099" - onload="<?php echo $ONLOAD; ?>"> + <?php echo $onload; ?>> <!--UdmComment--> <table border="0" cellspacing="0" cellpadding="0" width="100%">