Changeset 17152

Timestamp:

2008/03/13 18:21:56 (18 years ago)

Author:

adachi

Message:

merge r17146:17151

Location:

branches/comu-ver2

Files:

• data/class/SC_Initial.php (modified) (1 diff)
• data/class/pages/entry/LC_Page_Entry.php (modified) (1 diff)
• data/include/module.inc (modified) (1 diff)
• html/install/index.php (modified) (2 diffs)
• release.sh (modified) (2 diffs)

branches/comu-ver2/data/class/SC_Initial.php

@@ -38 +38 @@
 
         /** EC-CUBEのバージョン */
-        define('ECCUBE_VERSION', "2.1.0-beta");
+        define('ECCUBE_VERSION', "2.1.1-beta");
     }
 

branches/comu-ver2/data/class/pages/entry/LC_Page_Entry.php

@@ -75 +75 @@
 
         // 規約ページからの遷移でなければエラー画面へ遷移する
-        if (empty($_POST) && basename($_SERVER['HTTP_REFERER']) != 'kiyaku.php') {
+        if (empty($_POST) && !preg_match('/kiyaku.php/', basename($_SERVER['HTTP_REFERER']))) {
             SC_Utils_Ex::sfDispSiteError(PAGE_ERROR, "", true);
         }

branches/comu-ver2/data/include/module.inc

@@ -22 +22 @@
  */
 
-if (!defined('ECCUBE_INSTALL')) {
+if (!defined('ECCUBE_INSTALL')
+ || preg_match('|install/index.php|', $_SERVER['PHP_SELF'])) {
+
     return;
 }

branches/comu-ver2/html/install/index.php

@@ -28 +28 @@
 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 +841 @@
         $data_path = $data_path . "/";
     }
-    
+
     $filepath = $data_path . "install.php";
 

branches/comu-ver2/release.sh

@@ -3 +3 @@
 CURRENT_DIR=`pwd`
 TMP_DIR=/tmp
-SVN_PATH=file:///home/svn/open/branches/version-2
-ECCUBE_VERSION=2.0.1
+SVN_REPO=file:///home/svn/open
+SVN_PATH=$SVN_REPO/branches/version-2
+SVN_TAGS=$SVN_REPO/tags
+ECCUBE_VERSION=2.1.1-beta
 WRK_DIR=eccube-$ECCUBE_VERSION
 
@@ -21 +23 @@
 rm -rf $WRK_DIR/templates
 rm -rf $WRK_DIR/convert.php
-rm -rf $WRK_DIR/release.sh
+rm -rf $WRK_DIR/*.sh
 rm -rf $WRK_DIR/html/test
 rm -rf $WRK_DIR/data/downloads/module/*
-rm -rf $WRK_DIR/data/downloads/module2/*
 find ./$WRK_DIR -name "dummy" -delete
 find ./$WRK_DIR -name "info.php" -delete