Index: branches/5.1.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -N -r12127 -r12453 --- branches/5.1.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 12127) +++ branches/5.1.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 12453) @@ -1,6 +1,6 @@ 0) { + $replacements = Array ('INSERT INTO ', 'UPDATE ', 'ALTER TABLE ', 'DELETE FROM ', 'REPLACE INTO '); + foreach ($replacements as $replacement) { + $sql = str_replace($replacement, $replacement . $table_prefix, $sql); + } + } - $what = "INSERT INTO "; - $replace = "INSERT INTO ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); + $sql = str_replace('CREATE TABLE ', 'CREATE TABLE IF NOT EXISTS ' . $table_prefix, $sql); + $sql = str_replace('DROP TABLE ', 'DROP TABLE IF EXISTS ' . $table_prefix, $sql); - $what = "UPDATE "; - $replace = "UPDATE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - - $what = "ALTER TABLE "; - $replace = "ALTER TABLE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - } - $commands = explode("# --------------------------------------------------------",$sql); if(count($commands)>0) { @@ -1070,36 +1058,17 @@ if(strlen(trim($sql))>0 && substr($sql,0,1)!="#") { $table_prefix = 'restore'.TABLE_PREFIX; - if(strlen($table_prefix)) - { - $what = "CREATE TABLE "; - $replace = "CREATE TABLE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - $what = "DELETE FROM "; - $replace = "DELETE FROM ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); + if (strlen($table_prefix) > 0) { + $replacements = Array ('INSERT INTO ', 'UPDATE ', 'ALTER TABLE ', 'DELETE FROM ', 'REPLACE INTO '); + foreach ($replacements as $replacement) { + $sql = str_replace($replacement, $replacement . $table_prefix, $sql); + } + } - $what = "DROP TABLE "; - $replace = "DROP TABLE IF EXISTS ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); + $sql = str_replace('CREATE TABLE ', 'CREATE TABLE IF NOT EXISTS ' . $table_prefix, $sql); + $sql = str_replace('DROP TABLE ', 'DROP TABLE IF EXISTS ' . $table_prefix, $sql); - $what = "INSERT INTO "; - $replace = "INSERT INTO ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - - $what = "REPLACE INTO "; - $replace = "REPLACE INTO ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - - $what = "UPDATE "; - $replace = "UPDATE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - - $what = "ALTER TABLE "; - $replace = "ALTER TABLE ".$table_prefix; - $sql = ereg_replace($what, $replace, $sql); - } $sql = trim($sql); if(strlen($sql)>0) {