mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Reinstate temporarily commented out code

Browse Source
This commit is contained in:
e107steved
2009-01-04 16:39:14 +00:00
parent 0567d832c9
commit 9aa53886b5
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
install_.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/install_.php,v $ | $Source: /cvs_backup/e107_0.8/install_.php,v $
| $Revision: 1.15 $ | $Revision: 1.16 $
| $Date: 2008-12-27 21:41:33 $ | $Date: 2009-01-04 16:39:14 $
| $Author: mcfly_e107 $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -776,20 +776,23 @@ This file has been generated by the installation script.
$sql_data = fread($fd, filesize($filename)); $sql_data = fread($fd, filesize($filename));
fclose ($fd); fclose ($fd);
if (!$sql_data) { if (!$sql_data)
{
return nl2br(LANINS_060)."<br /><br />"; return nl2br(LANINS_060)."<br /><br />";
} }
preg_match_all("/create(.*?)myisam;/si", $sql_data, $result ); preg_match_all("/create(.*?)myisam;/si", $sql_data, $result );
foreach ($result[0] as $sql_table) { foreach ($result[0] as $sql_table)
{
preg_match("/CREATE TABLE\s(.*?)\s\(/si", $sql_table, $match); preg_match("/CREATE TABLE\s(.*?)\s\(/si", $sql_table, $match);
$tablename = $match[1]; $tablename = $match[1];
preg_match_all("/create(.*?)myisam;/si", $sql_data, $result ); preg_match_all("/create(.*?)myisam;/si", $sql_data, $result );
$sql_table = preg_replace("/create table\s/si", "CREATE TABLE {$this->previous_steps['mysql']['prefix']}", $sql_table); $sql_table = preg_replace("/create table\s/si", "CREATE TABLE {$this->previous_steps['mysql']['prefix']}", $sql_table);
//if (!mysql_query($sql_table, $link)) { if (!mysql_query($sql_table, $link))
// return nl2br(LANINS_061."\n\n<b>".LANINS_083."\n</b><i>".mysql_error($link)."</i>"); {
//} return nl2br(LANINS_061."\n\n<b>".LANINS_083."\n</b><i>".mysql_error($link)."</i>");
}
} }
$datestamp = time(); $datestamp = time();