From: <ch...@us...> - 2010-08-28 21:12:16
|
Revision: 28745 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28745&view=rev Author: chealer Date: 2010-08-28 21:12:10 +0000 (Sat, 28 Aug 2010) Log Message: ----------- [ENH] Offer entering a new name if renaming fails because new name already taken Modified Paths: -------------- trunk/templates/tiki-rename_page.tpl trunk/tiki-rename_page.php Modified: trunk/templates/tiki-rename_page.tpl =================================================================== --- trunk/templates/tiki-rename_page.tpl 2010-08-28 18:27:30 UTC (rev 28744) +++ trunk/templates/tiki-rename_page.tpl 2010-08-28 21:12:10 UTC (rev 28745) @@ -19,6 +19,10 @@ <input type="hidden" name="badname" value="{$newname|escape}" /> <input type="submit" name="confirm" value='{tr}Use this name anyway{/tr}' /> {/if} + {elseif isset($msg)} + {remarksbox type=errors} + {$msg} + {/remarksbox} {/if} <table class="normal"> <tr> Modified: trunk/tiki-rename_page.php =================================================================== --- trunk/tiki-rename_page.php 2010-08-28 18:27:30 UTC (rev 28744) +++ trunk/tiki-rename_page.php 2010-08-28 21:12:10 UTC (rev 28745) @@ -61,8 +61,7 @@ break; case 2: $smarty->assign('msg', tra("Page already exists")); - $smarty->display("error.tpl"); - die; + break; } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |