Index: /branches/version-2/html/install/index.php
===================================================================
--- /branches/version-2/html/install/index.php	(revision 16809)
+++ /branches/version-2/html/install/index.php	(revision 17147)
@@ -28,18 +28,14 @@
 ini_set("max_execution_time", 300);
 
-class LC_Page {
-    function LC_Page() {
-        $this->arrDB_TYPE = array(
-            'pgsql' => 'PostgreSQL',
-            'mysql' => 'MySQL'
-        );
-        $this->arrDB_PORT = array(
-            'pgsql' => '',
-            'mysql' => ''
-        );
-    }
-}
-
-$objPage = new LC_Page();
+$objPage = new StdClass;
+$objPage->arrDB_TYPE = array(
+    'pgsql' => 'PostgreSQL',
+    'mysql' => 'MySQL'
+);
+$objPage->arrDB_PORT = array(
+    'pgsql' => '',
+    'mysql' => ''
+);
+
 $objDb = new SC_Helper_DB_Ex();
 
@@ -845,5 +841,5 @@
 		$data_path = $data_path . "/";
     }
-    
+
     $filepath = $data_path . "install.php";
 
Index: /branches/version-2/data/include/module.inc
===================================================================
--- /branches/version-2/data/include/module.inc	(revision 17138)
+++ /branches/version-2/data/include/module.inc	(revision 17147)
@@ -22,5 +22,7 @@
  */
 
-if (!defined('ECCUBE_INSTALL')) {
+if (!defined('ECCUBE_INSTALL')
+ || preg_match('|install/index.php|', $_SERVER['PHP_SELF'])) {
+
     return;
 }