diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-10-10 16:54:47 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-10-10 16:54:47 +0000 |
| commit | 29b4b91a9a220bd462eab6320cf16a2ddf4be112 (patch) | |
| tree | 4f1dba1a22bf6dcda05036ee2cc3ed72f567abf8 /install/ElggInstaller.php | |
| parent | 84b6401dc8cdc8cb3d9233e436ed22187a7dc3e5 (diff) | |
| download | elgg-29b4b91a9a220bd462eab6320cf16a2ddf4be112.tar.gz elgg-29b4b91a9a220bd462eab6320cf16a2ddf4be112.tar.bz2 | |
better error messages when there are already Elgg database tables in the database
git-svn-id: http://code.elgg.org/elgg/trunk@7046 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'install/ElggInstaller.php')
| -rw-r--r-- | install/ElggInstaller.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php index 687a5bcab..192139084 100644 --- a/install/ElggInstaller.php +++ b/install/ElggInstaller.php @@ -1130,7 +1130,11 @@ class ElggInstaller { try { run_sql_script("{$CONFIG->path}engine/schema/mysql.sql"); } catch (Exception $e) { - register_error($e->getMessage()); + $msg = $e->getMessage(); + if (strpos($msg, 'already exists')) { + $msg = elgg_echo('install:error:tables_exist'); + } + register_error($msg); return FALSE; } |