diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-06-28 01:55:32 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-06-28 01:55:32 +0400 |
| commit | 3bde595666bf7cdcc8b28738d5396f8a8258af90 (patch) | |
| tree | 7456de1dc339fcfc44b58ae2770c76c9d47f3c1e /import.php | |
| parent | c734e1fd14094c2545c8305e35358e57cf485ab7 (diff) | |
| parent | 49a39787c3d44817c4c9056e0488d420a0e000ab (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Diffstat (limited to 'import.php')
| -rw-r--r-- | import.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/import.php b/import.php index 1246f209e0..64756b5a02 100644 --- a/import.php +++ b/import.php @@ -3,7 +3,6 @@ /** * Core script for import, this is just the glue around all other stuff * - * @uses PMA_Bookmark_getList() * @package phpMyAdmin */ @@ -154,7 +153,7 @@ if (!empty($id_bookmark)) { case 0: // bookmarked query that have to be run $import_text = PMA_Bookmark_get($db, $id_bookmark, 'id', isset($action_bookmark_all)); if (isset($bookmark_variable) && !empty($bookmark_variable)) { - $import_text = preg_replace('|/\*(.*)\[VARIABLE\](.*)\*/|imsU', '${1}' . PMA_sqlAddslashes($bookmark_variable) . '${2}', $import_text); + $import_text = preg_replace('|/\*(.*)\[VARIABLE\](.*)\*/|imsU', '${1}' . PMA_sqlAddSlashes($bookmark_variable) . '${2}', $import_text); } // refresh left frame on changes in table or db structure |