[geeklog-cvs] geeklog: Use $dbconfig_path when checking for the available data...

[geeklog-cvs at lists.geeklog.net]

changeset 7769:ea62d0d46949
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ea62d0d46949
user: Dirk Haun <dirk at haun-online.de>
date: Sun Mar 07 21:36:10 2010 +0100
description:
Use $dbconfig_path when checking for the available databases, as $gl_path may not have the proper path (reported by gedex)

diffstat:

 public_html/admin/install/index.php       |  2 +-
 public_html/admin/install/lib-install.php |  4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r e611e17b85ec -r ea62d0d46949 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun Mar 07 17:56:57 2010 +0000
+++ b/public_html/admin/install/index.php	Sun Mar 07 21:36:10 2010 +0100
@@ -163,7 +163,7 @@
             <p><label class="' . $form_label_dir . '">' . $LANG_INSTALL[33] . ' ' . INST_helpLink('site_slogan') . '</label> <input type="text" name="site_slogan" value="' . htmlspecialchars($site_slogan) . '" size="40"' . XHTML . '></p>
             <p><label class="' . $form_label_dir . '">' . $LANG_INSTALL[34] . ' ' . INST_helpLink('db_type') . '</label> <select name="db_type">'
 
-            . INST_listOfSupportedDBs($gl_path, $db_selected,
+            . INST_listOfSupportedDBs($dbconfig_path, $db_selected,
                     ($install_type == 'install' ? true : false)) .
 
            '</select> ' . '</p>
diff -r e611e17b85ec -r ea62d0d46949 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Mar 07 17:56:57 2010 +0000
+++ b/public_html/admin/install/lib-install.php	Sun Mar 07 21:36:10 2010 +0100
@@ -1231,6 +1231,10 @@
 
     $retval = '';
 
+    if (substr($gl_path, -13) == 'db-config.php') {
+        $gl_path = dirname($gl_path);
+    }
+
     $dbs = array(
         'mysql'        => array('file'  => 'mysql',
                                 'fn'    => 'mysql_connect',