From e8c649664a74cec508af2f90bbc5f21b4541d220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Sat, 24 May 2014 20:11:34 +0200
Subject: [PATCH] removed temporary migrations

---
 application/core/Database/MigrationHelper.php  | 18 +++---------------
 .../MCTeam/Dedimania/DedimaniaPlugin.php       |  3 ---
 application/plugins/MCTeam/KarmaPlugin.php     |  3 ---
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/application/core/Database/MigrationHelper.php b/application/core/Database/MigrationHelper.php
index 3ed3088f..0df10f52 100644
--- a/application/core/Database/MigrationHelper.php
+++ b/application/core/Database/MigrationHelper.php
@@ -4,6 +4,7 @@ namespace ManiaControl\Database;
 
 use ManiaControl\ManiaControl;
 use ManiaControl\Settings\SettingManager;
+use ManiaControl\Utils\ClassUtil;
 
 /**
  * Database Migration Assistant
@@ -35,8 +36,8 @@ class MigrationHelper {
 	 * @return bool
 	 */
 	public function transferSettings($sourceClass, $targetClass) {
-		$sourceClass = $this->getClass($sourceClass);
-		$targetClass = $this->getClass($targetClass);
+		$sourceClass = ClassUtil::getClass($sourceClass);
+		$targetClass = ClassUtil::getClass($targetClass);
 
 		$mysqli = $this->maniaControl->database->mysqli;
 
@@ -60,17 +61,4 @@ class MigrationHelper {
 		$statement->close();
 		return $success;
 	}
-
-	/**
-	 * Get the Class of the given Object
-	 *
-	 * @param mixed $class
-	 * @return string
-	 */
-	private function getClass($class) {
-		if (is_object($class)) {
-			return get_class($class);
-		}
-		return (string)$class;
-	}
 }
diff --git a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
index 03236588..b6140700 100644
--- a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
+++ b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
@@ -74,9 +74,6 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene
 	 * @see \ManiaControl\Plugins\Plugin::prepare()
 	 */
 	public static function prepare(ManiaControl $maniaControl) {
-		$maniaControl->database->migrationHelper->transferSettings('Dedimania\Dedimania', get_class());
-		$maniaControl->database->migrationHelper->transferSettings('Dedimania\DedimaniaPlugin', get_class());
-
 		$servers = $maniaControl->server->getAllServers();
 		foreach ($servers as $server) {
 			$maniaControl->settingManager->initSetting(get_class(), self::SETTING_DEDIMANIA_CODE . $server->login . '$l', '');
diff --git a/application/plugins/MCTeam/KarmaPlugin.php b/application/plugins/MCTeam/KarmaPlugin.php
index a368e59c..c0b9d229 100644
--- a/application/plugins/MCTeam/KarmaPlugin.php
+++ b/application/plugins/MCTeam/KarmaPlugin.php
@@ -207,9 +207,6 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
 			trigger_error($mysqli->error, E_USER_ERROR);
 		}
 
-		// Migrate settings
-		$this->maniaControl->database->migrationHelper->transferSettings('KarmaPlugin', $this);
-
 		if (!$this->maniaControl->settingManager->getSettingValue($this, self::SETTING_MX_KARMA_ACTIVATED)) {
 			return;
 		}