[geeklog-cvs] geeklog: Made $use_innodb a global variable (sigh) so that a fre...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d81b526dcf81
changeset: 7260:d81b526dcf81
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 19:57:10 2009 +0200
description:
Made $use_innodb a global variable (sigh) so that a fresh install with InnoDB tables actually creates InnoDB tables ...

diffstat:

 public_html/admin/install/index.php       |  11 ++++++-----
 public_html/admin/install/lib-upgrade.php |   2 +-
 public_html/docs/history                  |   1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (69 lines):

diff -r 27241d25a32d -r d81b526dcf81 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sat Aug 29 19:35:18 2009 +0200
+++ b/public_html/admin/install/index.php	Sat Aug 29 19:57:10 2009 +0200
@@ -47,7 +47,7 @@
  */
 function INST_installEngine($install_type, $install_step)
 {
-    global $_CONF, $_TABLES, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_DB_dbms, $_DB_table_prefix, $_URL, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir;
+    global $_CONF, $_TABLES, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_DB_dbms, $_DB_table_prefix, $_URL, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir, $use_innodb;
 
     switch ($install_step) {
 
@@ -446,7 +446,7 @@
 
                 } else {
 
-                    if (INST_createDatabaseStructures($use_innodb)) {
+                    if (INST_createDatabaseStructures()) {
                         $site_name      = isset($_POST['site_name']) ? $_POST['site_name'] : (isset($_GET['site_name']) ? $_GET['site_name'] : '') ;
                         $site_slogan    = isset($_POST['site_slogan']) ? $_POST['site_slogan'] : (isset($_GET['site_slogan']) ? $_GET['site_slogan'] : '') ;
                         $site_url       = isset($_POST['site_url']) ? $_POST['site_url'] : (isset($_GET['site_url']) ? $_GET['site_url'] : '') ;
@@ -729,13 +729,13 @@
 /**
  * Sets up the database tables
  *
- * @param   boolean $use_innodb     Whether to use InnoDB table support if using MySQL
  * @return  boolean                 True if successful
  *
  */
-function INST_createDatabaseStructures ($use_innodb = false)
+function INST_createDatabaseStructures()
 {
-    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass, $site_url;
+    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass,
+           $site_url, $use_innodb;
 
     $_DB->setDisplayError (true);
 
@@ -884,6 +884,7 @@
 $dbconfig_path      = INST_sanitizePath($dbconfig_path);
 $step               = isset($_GET['step']) ? $_GET['step'] : (isset($_POST['step']) ? $_POST['step'] : 1);
 $mode               = isset($_GET['mode']) ? $_GET['mode'] : (isset($_POST['mode']) ? $_POST['mode'] : '');
+$use_innodb = false;
 
 // $display holds all the outputted HTML and content
 if (defined('XHTML')) {
diff -r 27241d25a32d -r d81b526dcf81 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sat Aug 29 19:35:18 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Sat Aug 29 19:57:10 2009 +0200
@@ -721,7 +721,7 @@
  */
 function INST_updateDB($_SQL)
 {
-    global $progress, $_DB, $_DB_dbms;
+    global $progress, $use_innodb, $_DB, $_DB_dbms;
 
     $_SQL = INST_checkInnodbUpgrade($_SQL);
     foreach ($_SQL as $sql) {
diff -r 27241d25a32d -r d81b526dcf81 public_html/docs/history
--- a/public_html/docs/history	Sat Aug 29 19:35:18 2009 +0200
+++ b/public_html/docs/history	Sat Aug 29 19:57:10 2009 +0200
@@ -3,6 +3,7 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- Fixed installation using InnoDB tables [Dirk]
 - Send a notification when a comment goes into the submission queue [Dirk]
 - Added a link back to the story to the "Mail Story to a Friend" form [Dirk]
 - Only list [code], [raw] tags when story.* permissions are required [Dirk]