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

Don't consider adding commas to comment lines

Browse Source 
As the comma won't be at the end, but in the middle and adding one to
the end causes PHP issues
This commit is contained in:
Matt Pass
2015-06-26 14:34:10 +01:00
parent ab0cef93b7
commit f7d9b050b3
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

@@ -178,8 +178,8 @@ 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) != ",") {
// 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);
}
}