[geeklog-cvs] geeklog: Make the database input fields behave like they do for ...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1aceb360b6ea
changeset: 6620:1aceb360b6ea
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Dec 31 19:56:03 2008 +0100
description:
Make the database input fields behave like they do for a fresh install and upgrade

diffstat:

1 file changed, 8 insertions(+)
public_html/admin/install/migrate.php |    8 ++++++++

diffs (18 lines):

diff -r f6cceb986985 -r 1aceb360b6ea public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Wed Dec 31 19:05:40 2008 +0100
+++ b/public_html/admin/install/migrate.php	Wed Dec 31 19:56:03 2008 +0100
@@ -211,6 +211,14 @@
                         'user' => 'username',
                         'pass' => '',
                         'prefix' => 'gl_' );
+        if (file_exists($dbconfig_path)) {
+            require_once $dbconfig_path;
+
+            $_FORM['host'] = ($_DB_host != 'localhost' ? '' : $_DB_host);
+            $_FORM['name'] = ($_DB_name != 'geeklog' ? '' : $_DB_name);
+            $_FORM['user'] = ($_DB_user != 'username' ? '' : $_DB_user);
+            $_FORM['prefix'] = $_DB_table_prefix;
+        }
 
         // Set up the URL and admin URL paths.
         $site_url = isset($_REQUEST['site_url']) ? $_REQUEST['site_url'] : 'http://' . $_SERVER['HTTP_HOST'] . preg_replace('/\/admin.*/', '', $_SERVER['PHP_SELF']) ;