From fa56caa1c909ac666164a02a937af4ff53f68614 Mon Sep 17 00:00:00 2001
From: Vladimir Sibirov <trustmaster@kodigy.com>
Date: Sat, 4 Jan 2014 21:38:04 +0400
Subject: [PATCH] Fix for `CotDB::runScript` to support custom table names set
 in config.php. A part of #1301.

---
 system/database.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/system/database.php b/system/database.php
index 58a8123c1..8e8644f87 100644
--- a/system/database.php
+++ b/system/database.php
@@ -503,9 +503,17 @@ public function runScript($script)
 			$query = trim($query);
 			if (!empty($query))
 			{
-				if ($db_x != 'cot_')
+				if ($db_x != 'cot_' && preg_match('#`cot_(\w+)`#', $query, $mt))
 				{
-					$query = str_replace('`cot_', '`'.$db_x, $query);
+					if (isset($GLOBALS['db_' . $mt[1]]))
+					{
+						$table_name = $GLOBALS['db_' . $mt[1]];
+						$query = str_replace($mt[0], "`$table_name`", $query);
+					}
+					else
+					{
+						$query = str_replace('`cot_', '`'.$db_x, $query);
+					}
 				}
 				$result = $this->query($query);
 				if (!$result)