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

codeMirroDir removed from updater key check

Browse Source
This commit is contained in:
mattpass
2020-03-21 08:54:01 +00:00
parent 66325c32d1
commit b376e41406
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/updater.php
View File

@@ -144,11 +144,11 @@ function transposeSettings($oldFile,$newFile,$saveFile) {
$contentLine = $newSettingsArray[$i].PHP_EOL;
for ($j=0; $j<count($oldSettingsArray); $j++) {
// And override with old setting if not blank, not in excluded array and we have a match
if ($thisKey != "" && $thisKey != "versionNo" && $thisKey != "codeMirrorDir" && strpos($oldSettingsArray[$j],'"'.$thisKey.'"') > -1) {
if ($thisKey != "" && $thisKey != "versionNo" && strpos($oldSettingsArray[$j],'"'.$thisKey.'"') > -1) {
$contentLine = $oldSettingsArray[$j].PHP_EOL;
// If the old setting we're copying over isn't replacing the last line and doesn't end in a comma (after an rtrim to remove line endings), and doesn't contain a comment, add one
if ($i != count($newSettingsArray)-1 && substr(rtrim($contentLine),-1) != "," && strpos($contentLine,"//") == -1) {
$contentLine = str_replace(PHP_EOL,",".PHP_EOL,$contentLine);
$contentLine = str_replace(PHP_EOL,",".PHP_EOL,$contentLine);
}
}
}