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

Old settings that aren't last line end with comma

Browse Source
This commit is contained in:
Matt Pass
2014-07-01 14:17:24 +01:00
parent 69aec81200
commit e8035c122c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/updater.php
View File

@@ -150,6 +150,10 @@ function transposeSettings($oldFile,$newFile,$saveFile) {
// 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) {
$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), add one
if ($i != count($newSettingsArray)-1 && substr(rtrim($contentLine),-1) != ",") {
$contentLine = str_replace(PHP_EOL,",".PHP_EOL,$contentLine);
}
}
}
$contents .= $contentLine;