From 972dba3037d4242f6dd65ec04e96e494717fcbc2 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Wed, 23 Jan 2013 13:23:10 -0800
Subject: [PATCH] Moved e107_admin/sql/core_sql.php to
 e107_core/sql/core_sql.php

---
 {e107_admin => e107_core}/sql/core_sql.php     | 0
 e107_handlers/db_verify_class.php              | 2 +-
 e107_languages/English/admin/lan_db_verify.php | 2 +-
 e107_languages/English/lan_installer.php       | 2 +-
 e107_web/utilities/dbgen.php                   | 4 ++--
 install_.php                                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename {e107_admin => e107_core}/sql/core_sql.php (100%)

diff --git a/e107_admin/sql/core_sql.php b/e107_core/sql/core_sql.php
similarity index 100%
rename from e107_admin/sql/core_sql.php
rename to e107_core/sql/core_sql.php
diff --git a/e107_handlers/db_verify_class.php b/e107_handlers/db_verify_class.php
index dbfa346ab..bf24447d5 100644
--- a/e107_handlers/db_verify_class.php
+++ b/e107_handlers/db_verify_class.php
@@ -57,7 +57,7 @@ class db_verify
 			
 		$this->backUrl = e_SELF;	
 			
-		$core_data = file_get_contents(e_ADMIN.'sql/core_sql.php');
+		$core_data = file_get_contents(e_CORE.'sql/core_sql.php');
 		$this->tables['core'] = $this->getTables($core_data);
 		
 		$this->sqlLanguageTables = $this->getSqlLanguages();
diff --git a/e107_languages/English/admin/lan_db_verify.php b/e107_languages/English/admin/lan_db_verify.php
index 5132935ac..a27395499 100644
--- a/e107_languages/English/admin/lan_db_verify.php
+++ b/e107_languages/English/admin/lan_db_verify.php
@@ -9,7 +9,7 @@
 |     $Author$
 +----------------------------------------------------------------------------+
 */
-define("DBVLAN_1", "Unable to read the sql datafile<br /><br />Please ensure the file <b>core_sql.php</b> exists in the <b>/admin/sql</b> directory.");
+define("DBVLAN_1", "Unable to read the sql datafile<br /><br />Please ensure the file <b>core_sql.php</b> exists in the <b>/e107_core/sql</b> directory.");
 // define("DBLAN_2", "Verifying all");
 
 define("DBVLAN_4", "Table");
diff --git a/e107_languages/English/lan_installer.php b/e107_languages/English/lan_installer.php
index fd62cf384..8def8c2eb 100644
--- a/e107_languages/English/lan_installer.php
+++ b/e107_languages/English/lan_installer.php
@@ -86,7 +86,7 @@ Please click the button to create the database tables and save all your settings
 define("LANINS_058", "7");
 define("LANINS_060", "Unable to read the sql datafile
 
-Please ensure the file <b>core_sql.php</b> exists in the <b>/e107_admin/sql</b> directory.");
+Please ensure the file <b>core_sql.php</b> exists in the <b>/e107_core/sql</b> directory.");
 define("LANINS_061", "e107 was unable to create all of the required database tables.
 Please clear the database and rectify any problems before trying again.");
 
diff --git a/e107_web/utilities/dbgen.php b/e107_web/utilities/dbgen.php
index 6f15dd336..5544caf8c 100644
--- a/e107_web/utilities/dbgen.php
+++ b/e107_web/utilities/dbgen.php
@@ -26,12 +26,12 @@ $dbAdm = new db_table_admin();
 
 
 // Create an array of all tables
-$tableStruct = $dbAdm->get_table_def('',e_ADMIN.'sql/core_sql.php');
+$tableStruct = $dbAdm->get_table_def('',e_CORE.'sql/core_sql.php');
 $tableArray = array();
 
 foreach ($tableStruct as $t)
 {
-	$tableArray[$t[1]] = array('src' => e_ADMIN.'sql/core_sql.php', 'desc' => 'core:'.$t[1]);
+	$tableArray[$t[1]] = array('src' => e_CORE.'sql/core_sql.php', 'desc' => 'core:'.$t[1]);
 }
 
 
diff --git a/install_.php b/install_.php
index 7f3ce93f4..7bb1c96e3 100644
--- a/install_.php
+++ b/install_.php
@@ -1593,7 +1593,7 @@ class e_install
 			return nl2br(LANINS_085." '{$this->previous_steps['mysql']['db']}'\n\n<b>".LANINS_083."\n</b><i>".mysql_error($link)."</i>");
 		}
 
-		$filename = "{$this->e107->e107_dirs['ADMIN_DIRECTORY']}sql/core_sql.php";
+		$filename = "{$this->e107->e107_dirs['CORE_DIRECTORY']}sql/core_sql.php";
 		$fd = fopen ($filename, "r");
 		$sql_data = fread($fd, filesize($filename));
 		$sql_data = preg_replace("#\/\*.*?\*\/#mis", '', $sql_data);		// Strip comments