1
0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00

Moved e107_admin/sql/core_sql.php to e107_core/sql/core_sql.php

This commit is contained in:
Cameron 2013-01-23 13:23:10 -08:00
parent 47474aeedf
commit 972dba3037
6 changed files with 6 additions and 6 deletions

View File

@ -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();

View File

@ -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");

View File

@ -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.");

View File

@ -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]);
}

View File

@ -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