From 8e8f1b9a5844d3139298d4a6d28b37b35502ca6d Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Wed, 22 Aug 2012 12:24:41 -0400
Subject: [PATCH] removed a usless check. added the project's first type
 annotations

---
 .../upgrades/airtime-2.2.0/common/UpgradeCommon.php      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
index 3ccd05606..199d22fe5 100644
--- a/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
+++ b/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
@@ -127,7 +127,7 @@ class UpgradeCommon{
             "../etc/api_client.cfg"    => self::CONF_FILE_API_CLIENT
         );
 
-        echo "Copying configs:";
+        echo "Copying configs:\n";
         foreach ($config_copy as $path_part => $destination) {
             $full_path = OsPath::normpath(OsPath::join(__DIR__, 
                                                        "$path_part.$suffix"));
@@ -139,13 +139,8 @@ class UpgradeCommon{
         }
     }
 
-    private static function MergeConfigFiles($configFiles, $suffix) {
+    private static function MergeConfigFiles(array $configFiles, $suffix) {
         foreach ($configFiles as $conf) {
-            // we want to use new liquidsoap.cfg so don't merge
-            // also for monit
-            if( $conf == self::CONF_FILE_LIQUIDSOAP){
-                continue;
-            }
             if (file_exists("$conf$suffix.bak")) {
 
                 if($conf === self::CONF_FILE_AIRTIME) {