Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv27862
Modified Files:
loadsave.php
Log Message:
Redo bugfix: My last refactoring broke merge-edit & overwrite
functionality again, should be fixed now. Sorry.
Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -2 -b -p -d -r1.83 -r1.84
--- loadsave.php 20 Nov 2003 22:18:54 -0000 1.83
+++ loadsave.php 26 Nov 2003 20:47:47 -0000 1.84
@@ -467,15 +467,14 @@ function SavePage (&$request, $pageinfo,
global $Theme;
$meb = Button(array('action' => 'loadfile',
- 'merge'=> 1,
+ 'merge'=> true,
'source'=> dirname($f) . "/"
- . FilenameForPage(basename($f))),
+ . basename($f)),
_("Merge Edit"),
_("PhpWikiAdministration"),
'wikiadmin');
$owb = Button(array('action' => 'loadfile',
- 'merge'=> 1,
- 'overwrite'=> 1,
+ 'overwrite'=> true,
'source'=> dirname($f) . "/"
- . FilenameForPage(basename($f))),
+ . basename($f)),
_("Restore Anyway"),
_("PhpWikiAdministration"),
@@ -837,4 +836,8 @@ function LoadPostFile (&$request)
/**
$Log$
+ Revision 1.84 2003年11月26日 20:47:47 carstenklapp
+ Redo bugfix: My last refactoring broke merge-edit & overwrite
+ functionality again, should be fixed now. Sorry.
+
Revision 1.83 2003年11月20日 22:18:54 carstenklapp
New feature: h1 during merge-edit displays WikiLink to original page.