From: <var...@us...> - 2012-03-05 08:49:48
|
Revision: 8244 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8244&view=rev Author: vargenau Date: 2012-03-05 08:49:38 +0000 (Mon, 05 Mar 2012) Log Message: ----------- Avoid warning for function getConflictMessage Modified Paths: -------------- trunk/lib/editpage.php Modified: trunk/lib/editpage.php =================================================================== --- trunk/lib/editpage.php 2012-03-01 11:58:38 UTC (rev 8243) +++ trunk/lib/editpage.php 2012-03-05 08:49:38 UTC (rev 8244) @@ -941,7 +941,7 @@ return true; } - function getConflictMessage () { + function getConflictMessage ($unresolved = false) { $message = HTML(HTML::p(fmt("Some of the changes could not automatically be combined. Please look for sections beginning with '%s', and ending with '%s'. You will need to edit those sections by hand before you click Save.", "<<<<<<<", "======="), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |