Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[45072] trunk/tiki-editpage.php
|
From: <jon...@us...> - 2013-03-06 17:27:09
|
Revision: 45072
http://sourceforge.net/p/tikiwiki/code/45072
Author: jonnybradley
Date: 2013-03-06 17:27:06 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
[FIX] editpage: Don't add a second ? in the URL for conflictoverride (var $url not set previously)
Modified Paths:
--------------
trunk/tiki-editpage.php
Modified: trunk/tiki-editpage.php
===================================================================
--- trunk/tiki-editpage.php 2013-03-06 17:25:56 UTC (rev 45071)
+++ trunk/tiki-editpage.php 2013-03-06 17:27:06 UTC (rev 45072)
@@ -335,7 +335,7 @@
$msg = tr("This page is being edited by %0. Please check with the user before editing the page, otherwise the changes will be stored as two separate versions in the history and you will have to manually merge them later.", $semUser);
$msg .= '<br /><br /><a href="tiki-editpage.php?page=';
$msg .= urlencode($page);
- $msg .= (strpos('?', $url) === false ? '?' : '&') . 'conflictoverride=y">' . tra('Override lock and carry on with edit') . '</a>';
+ $msg .= '&conflictoverride=y">' . tra('Override lock and carry on with edit') . '</a>';
$smarty->assign('msg', $msg);
$smarty->assign('errortitle', tra('Page is currently being edited'));
$smarty->display("error.tpl");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|