Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv3835/lib
Modified Files:
config.php savepage.php
Log Message:
Don't display $SignatureImg unless one is set in config.php
Fix check for DB files in /tmp
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** config.php 2001年02月08日 15:11:00 1.27
--- config.php 2001年02月08日 18:19:16 1.28
***************
*** 136,141 ****
// logo image (path relative to index.php)
$logo = "images/wikibase.png";
! // signature image which is shown after saving an edited page
! $SignatureImg = "images/signature.png";
// date & time formats used to display modification times, etc.
--- 136,143 ----
// logo image (path relative to index.php)
$logo = "images/wikibase.png";
!
! // Signature image which is shown after saving an edited page
! // If this is left blank (or unset), the signature will be omitted.
! //$SignatureImg = "images/signature.png";
// date & time formats used to display modification times, etc.
Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** savepage.php 2001年02月07日 22:14:35 1.8
--- savepage.php 2001年02月08日 18:19:16 1.9
***************
*** 178,183 ****
// fixme: no test for flat file db system
! if ($WikiPageStore == "/tmp/wikidb") {
! $html .= "<P><B>Warning: the Wiki DBM file still lives in the " .
"/tmp directory. Please read the INSTALL file and move " .
"the DBM file to a permanent location or risk losing " .
--- 178,183 ----
// fixme: no test for flat file db system
! if (isset($DBMdir) && preg_match('@^/tmp\b@', $DBMdir)) {
! $html .= "<P><B>Warning: the Wiki DB files still live in the " .
"/tmp directory. Please read the INSTALL file and move " .
"the DBM file to a permanent location or risk losing " .
***************
*** 185,189 ****
}
! $html .= "<P><img src=\"$SignatureImg\"></P><hr noshade><P>";
include('lib/transform.php');
--- 185,192 ----
}
! if (!empty($SignatureImg))
! $html .= "<P><img src=\"$SignatureImg\"></P>\n";
!
! $html .= "<hr noshade><P>";
include('lib/transform.php');