Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19625/lib
Modified Files:
config.php
Log Message:
use $SCRIPT_NAME instead of $REQUEST_URI
removed $ServerAddress - not used anywhere (simplifies $ScriptUrl="" case)
added ALT tag to logo image
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** config.php 2000/10/31 20:24:30 1.13
--- config.php 2000/11/01 10:24:58 1.14
***************
*** 89,93 ****
// Miscellanious
! // logo image
$logo = "images/wikibase.png";
// signature image which is shown after saving an edited page
--- 89,93 ----
// Miscellanious
! // logo image (path relative to index.php)
$logo = "images/wikibase.png";
// signature image which is shown after saving an edited page
***************
*** 180,194 ****
if (empty($ScriptUrl)) {
! if (preg_match("#(.*?)([^/]*$)#", $REQUEST_URI, $matches)) {
! $ServerAddress = "http://$SERVER_NAME:$SERVER_PORT" . $matches[1];
! } else {
! $ServerAddress = "http://$SERVER_NAME:$SERVER_PORT$REQUEST_URI";
! }
! $ScriptName = basename($HTTP_SERVER_VARS["PHP_SELF"]);
! $ScriptUrl = $ServerAddress . $ScriptName;
}
! $LogoImage = "<img src='${ServerAddress}$logo' border='0'>";
! $LogoImage = "<a href='$ScriptUrl'>$LogoImage</a>";
$FieldSeparator = "\263";
--- 180,188 ----
if (empty($ScriptUrl)) {
! $ScriptUrl = "http://$SERVER_NAME:$SERVER_PORT$SCRIPT_NAME";
}
! $LogoImage = "<img src=\"$logo\" border=0 ALT=\"[PhpWiki!]\">";
! $LogoImage = "<a href=\"$ScriptUrl\">$LogoImage</a>";
$FieldSeparator = "\263";
|
