Minor cleanup to some code in installation/upgrade which didn't conta…

…in a closing tag (/ was missing)
exponentcms · Jul 9, 2011 · 8d5ec8f · 8d5ec8f
1 parent 6e7ec23
commit 8d5ec8f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/install/pages/install-3.php b/install/pages/install-3.php
@@ -29,8 +29,8 @@
     <thead>
         <tr>
             <th colspan=2><?php echo gt('Results'); ?></th>
-        <tr>
-    <thead>
+        </tr>
+    </thead>
     <tbody>
 <?php
 
@@ -69,7 +69,7 @@ function isAllGood($str) {
 
 if ($passed) {
 	//set connection encoding, works only on mySQL > 4.1
-	if($config["db_engine"] == "mysql") {
+	if($config["db_engine"] == "mysqli") {
 		if (!defined("DB_ENCODING")) define("DB_ENCODING", $config["DB_ENCODING"]);
 	}
 	$db = exponent_database_connect($config['db_user'],$config['db_pass'],$config['db_host'],$config['db_name'],$config['db_engine'],1);
@@ -192,7 +192,6 @@ function isAllGood($str) {
 	}
 }
 
-
 if ($passed) {
 	echoStart($i18n['check_drop'].':');
 	$db->dropTable($tablename);

diff --git a/install/popup.php b/install/popup.php
@@ -26,7 +26,7 @@
 <html>
 <head>
 	<title><?php echo $i18n['title']; ?></title>
-	<link rel="stylesheet" title="exponent" href="page.css" />
+	<link rel="stylesheet" title="exponent" href="style.css" />
 	<link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/tables.css" />
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
 	<meta name="Generator" value="Exponent Content Management System" />

diff --git a/install/upgrades/install_tables.php b/install/upgrades/install_tables.php
@@ -101,7 +101,7 @@ function upgrade() {
             if (file_exists($dirpath)) {
                 $def_dir = opendir($dirpath);
                 while (($def = readdir($def_dir)) !== false) {
-                    eDebug("$dirpath/$def");
+//                    eDebug("$dirpath/$def");
     				if (is_readable("$dirpath/$def") && is_file("$dirpath/$def") && substr($def,-4,4) == ".php" && substr($def,-9,9) != ".info.php") {
     					$tablename = substr($def,0,-4);
     					$dd = include("$dirpath/$def");
@@ -188,7 +188,7 @@ function upgrade() {
 <?php
 		}
 	?>
-<tbody>
+</tbody>
 </table>
 		<?php
 		if ($line == 0) {

diff --git a/install/upgrades/version_tracking.php b/install/upgrades/version_tracking.php
@@ -40,6 +40,7 @@ function description() { return "Beginning with Exponent 2.0.0 Beta3, the system
 
 	/**
 	 * additional test(s) to see if upgrade script should be run
+	 * @param $version
 	 * @return bool
 	 */
 	function needed($version) {