Revert locally
svn merge -c -42700 .
--- Reverse-merging r42700 into '.': U tiki-check.php
Check
svn diff tiki-check.php
Index: tiki-check.php =================================================================== --- tiki-check.php (revision 42707) +++ tiki-check.php (working copy) @@ -5,7 +5,7 @@ // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. // $Id: tiki-admin_security.php 40813 2012-04-07 17:32:37Z jonnybradley $ -if (file_exists('./db/local.php') && ! isset($_REQUEST['standalone']) ) { +if (file_exists('./db/local.php')) { $standalone = false; require_once ('tiki-setup.php'); $access->check_permission('tiki_p_admin');
Commit
svn commit -m "[REVERT] Revert this commit" tiki-check.php
Sending tiki-check.php Transmitting file data . Committed revision 42709.