Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-12 03:26:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't compound doNext on upload

Browse Source
This commit is contained in:
mattpass
2020-06-13 10:47:59 +01:00
parent 69bb3f2905
commit 6259dd2883
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
classes/URL.php
View File

@@ -16,18 +16,17 @@ class URL
}
/**
* @param string $doNext
* @param $lineEnding
* @param $lineNumber
* @param string $lineEnding
* @param int $lineNumber
* @return string
*/
public function load($doNext = "", $lineEnding = "\n", $lineNumber = 1): string
public function load($lineEnding = "\n", $lineNumber = 1): string
{
// replace \r\n (Windows), \r (old Mac) and \n (Linux) line endings with whatever we chose to be lineEnding
$this->remoteFile = str_replace("\r\n", $lineEnding, $this->remoteFile);
$this->remoteFile = str_replace("\r", $lineEnding, $this->remoteFile);
$this->remoteFile = str_replace("\n", $lineEnding, $this->remoteFile);
$doNext .= 'ICEcoder.newTab(false);';
$doNext = 'ICEcoder.newTab(false);';
$doNext .= 'ICEcoder.getcMInstance().setValue(\'' . str_replace("\r", "", str_replace("\t", "\\\\t", str_replace("\n", "\\\\n", str_replace("'", "\\\\'", str_replace("\\", "\\\\", preg_quote($this->remoteFile)))))) . '\');';
$doNext .= 'ICEcoder.goToLine(' . $lineNumber . ');';

2
lib/file-control.php
View File

@@ -411,7 +411,7 @@ if (!isset($ftpSite) && !$error && "getRemoteFile" === $_GET['action']) {
if ($remoteFile = toUTF8noBOM(getData($file, 'curl'), true)) {
// Get URL contents
$url = new URL($remoteFile);
$doNext = $url->load($doNext, $ICEcoder["lineEnding"], $lineNumber);
$doNext .= $url->load($ICEcoder["lineEnding"], $lineNumber);
$finalAction = "getRemoteFile";
// Run any extra processes