From f75bd9fe533018e0ebde6e99c17bf52e035679d1 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Wed, 26 Nov 2014 09:35:51 +0000 Subject: [PATCH] doNext is starting and replace Win line endings too --- lib/file-control-xhr.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/file-control-xhr.php b/lib/file-control-xhr.php index f38be88..09b883c 100644 --- a/lib/file-control-xhr.php +++ b/lib/file-control-xhr.php @@ -167,7 +167,7 @@ if (!$error && $_GET['action']=="save") { } clearstatcache(); $filemtime = $serverType=="Linux" ? filemtime($file) : "1000000"; - $doNext .= 'top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.$filemtime.'";'; + $doNext = 'top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.$filemtime.'";'; // Reload file manager, rename tab & remove old file highlighting if it was a new file if (isset($_POST['newFileName']) && $_POST['newFileName']!="") { $doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\',false,false,false,\'file\');'; @@ -250,7 +250,7 @@ if (!$error && $_GET['action']=="save") { } else { $finalAction = "nothing"; - $doNext .= "top.ICEcoder.message('".$t['Sorry, cannot save']."\\\\n".$file."');"; + $doNext = "top.ICEcoder.message('".$t['Sorry, cannot save']."\\\\n".$file."');"; } $doNext .= 'top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);'; } @@ -284,7 +284,7 @@ echo '{ "timeEnd": 0, "timeTaken": 0, "csrf": "'.$_GET["csrf"].'", - "doNext" : "'.str_replace(PHP_EOL,'',str_replace(' ','',str_replace('"','\"',$doNext))).'top.ICEcoder.switchMode();" + "doNext" : "'.preg_replace('/\r|\n/','',str_replace(' ','',str_replace('"','\"',$doNext))).'top.ICEcoder.switchMode();" }, "status": { "error" : '.($error ? 'true' : 'false').',