From 7008bfb5c3b0654d7d25b2e0d0d53d09e4431c0c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 13 May 2009 00:32:19 +0000
Subject: Warn the user if they're attemping to reinstall into a database that
 already has Gallery 3 tables.  Otherwise, permit it to continue.

We key this off of the existence of the g3_items table.  Theoretically
it's possible that the g3_items table is gone but other tables are
still there, which could mess things up.  I'm not going to worry about
that for now.

Fixes ticket #175
---
 installer/views/db_not_empty.html.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'installer/views')

diff --git a/installer/views/db_not_empty.html.php b/installer/views/db_not_empty.html.php
index 7125a0b6..bc45458d 100644
--- a/installer/views/db_not_empty.html.php
+++ b/installer/views/db_not_empty.html.php
@@ -1,7 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <h1> Uh oh! </h1>
 <p class="error">
-  The database you provided already has other tables in it.
-  Continuing with the install might overwrite an existing Gallery
-  install.  Please go back and choose a different database.
+  The database you provided already has Gallery 3 tables in it.
+  Continuing with the install would overwrite your existing install.
+  Please either use a different database,  delete the old tables,
+  or choose a different table prefix.
 </p>
-- 
cgit v1.2.3