Merge pull request #21 from joomla-framework/importer-fix

Use internal prefix replacing method
joomla-framework · Jul 7, 2015 · 89d86ab · 89d86ab
2 parents ecd1bce + 7b4c4f4
commit 89d86ab
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/DatabaseImporter.php b/src/DatabaseImporter.php
@@ -237,7 +237,6 @@ protected function getRealTableName($table)
 	 */
 	protected function mergeStructure()
 	{
-		$prefix = $this->db->getPrefix();
 		$tables = $this->db->getTableList();
 
 		if ($this->from instanceof \SimpleXMLElement)
@@ -255,8 +254,7 @@ protected function mergeStructure()
 		foreach ($xmlTables as $table)
 		{
 			// Convert the magic prefix into the real table name.
-			$tableName = (string) $table['name'];
-			$tableName = preg_replace('|^#__|', $prefix, $tableName);
+			$tableName = $this->getRealTableName((string) $table['name']);
 
 			if (in_array($tableName, $tables))
 			{