Index: /branches/version-2_5-dev/html/install/index.php
===================================================================
--- /branches/version-2_5-dev/html/install/index.php (revision 19670)
+++ /branches/version-2_5-dev/html/install/index.php (revision 19675)
@@ -798,14 +798,14 @@
$options['debug'] = PEAR_DB_DEBUG;
$objDB = MDB2::connect($dsn, $options);
- $objDB->loadModule('Manager');
+ $objManager =& $objDB->loadModule('Manager');
// 接続エラー
if (!PEAR::isError($objDB)) {
- $exists = $objDB->listSequences();
+ $exists = $objManager->listSequences();
foreach ($arrSequences as $seq) {
$seq_name = $seq[0] . "_" . $seq[1];
if (in_array($seq_name, $exists)) {
- $result = $objDB->dropSequence($seq_name);
+ $result = $objManager->dropSequence($seq_name);
if (PEAR::isError($result)) {
$arrErr['all'] = ">> " . $result->message . "
";
@@ -836,10 +836,10 @@
$options['debug'] = PEAR_DB_DEBUG;
$objDB = MDB2::connect($dsn, $options);
- $objDB->loadModule('Manager');
+ $objManager =& $objDB->loadModule('Manager');
// 接続エラー
if (!PEAR::isError($objDB)) {
- $exists = $objDB->listSequences();
+ $exists = $objManager->listSequences();
foreach ($arrSequences as $seq) {
$res = $objDB->query("SELECT max(" . $seq[1] . ") FROM ". $seq[0]);
@@ -852,5 +852,5 @@
$seq_name = $seq[0] . "_" . $seq[1];
- $result = $objDB->createSequence($seq_name, $max + 1);
+ $result = $objManager->createSequence($seq_name, $max + 1);
if (PEAR::isError($result)) {
$arrErr['all'] = ">> " . $result->message . "
";
Index: /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql (revision 19671)
+++ /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql (revision 19675)
@@ -1252,8 +1252,8 @@
CREATE TABLE dtb_plugin (
plugin_id INT NOT NULL,
- plugin_name VARCHAR(255) NOT NULL DEFAULT "",
+ plugin_name VARCHAR(255) NOT NULL DEFAULT '',
enable INT NOT NULL DEFAULT 0,
del_flg INT NOT NULL DEFAULT 0,
- class_name VARCHAR(255) NOT NULL DEFAULT NULL,
+ class_name VARCHAR(255) NOT NULL DEFAULT '',
create_date DATETIME NOT NULL,
update_date DATETIME NOT NULL,
Index: /branches/version-2_5-dev/patches/MDB2_Driver_pgsql.php.patch
===================================================================
--- /branches/version-2_5-dev/patches/MDB2_Driver_pgsql.php.patch (revision 19675)
+++ /branches/version-2_5-dev/patches/MDB2_Driver_pgsql.php.patch (revision 19675)
@@ -0,0 +1,15 @@
+=== modified file 'data/module/MDB2/Driver/pgsql.php'
+--- data/module/MDB2/Driver/pgsql.php 2010-07-06 08:39:45 +0000
++++ data/module/MDB2/Driver/pgsql.php 2010-11-18 05:39:27 +0000
+@@ -929,7 +929,9 @@
+ } elseif (is_array($types) && array_key_exists($parameter, $types)) {
+ $pgtypes[] = $this->datatype->mapPrepareDatatype($types[$parameter]);
+ } else {
+- $pgtypes[] = 'text';
++ if (version_compare(PHP_VERSION, '5.0.0', '>')) {
++ $pgtypes[] = 'text';
++ }
+ }
+ }
+ if (($key_parameter = array_search($name, $positions))) {
+
Index: /branches/version-2_5-dev/data/class/SC_Response.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_Response.php (revision 19670)
+++ /branches/version-2_5-dev/data/class/SC_Response.php (revision 19675)
@@ -87,30 +87,30 @@
- function setContentType(String $contentType){
+ function setContentType($contentType){
$this->header['Content-Type'] = $contentType;
}
- function setResposeBody(String $body){
+ function setResposeBody($body){
$this->body = $body;
}
- /* function addDateHdeader(String $name, $date){
+ /* function addDateHdeader($name, $date){
*
* }
*/
- function addHeader(String $name, $value){
+ function addHeader($name, $value){
$this->header[$name] = $value;
}
- function containsHeader(String $name){
+ function containsHeader($name){
return isset($this->header[$name]);
}
- function sendError( $errorcode){
+ function sendError($errorcode){
header('HTTP/1.1 '.$errorcode.' '.$this->statusTexts[$errorcode]);
}
- function sendRedirect(String $location){
+ function sendRedirect($location){
if (preg_match("/(" . preg_quote(SITE_URL, '/')
. "|" . preg_quote(SSL_URL, '/') . ")/", $location)) {
@@ -133,5 +133,5 @@
}
- function reload(Array $queryString = array(), $removeQueryString = false) {
+ function reload($queryString = array(), $removeQueryString = false) {
// 現在の URL を取得
$netURL = new Net_URL($_SERVER['REQUEST_URI']);
@@ -152,9 +152,9 @@
}
- function setHeader(Array $headers){
+ function setHeader($headers){
$this->header = $headers;
}
- function setStatus( $sc = 202){
+ function setStatus($sc = 202){
$this->statuscode = $sc;
}
Index: /branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- /branches/version-2_5-dev/data/class/util/SC_Utils.php (revision 19670)
+++ /branches/version-2_5-dev/data/class/util/SC_Utils.php (revision 19675)
@@ -2247,5 +2247,7 @@
*/
function sfPutPluginsXml($pluginsXml) {
- if (!($pluginsXml instanceof SimpleXMLElement)) SC_Utils_Ex::sfDispException();
+ if (version_compare(PHP_VERSION, '5.0.0', '>')) {
+ return;
+ }
$xml = $pluginsXml->asXML();
@@ -2254,5 +2256,4 @@
$return = file_put_contents(PLUGIN_PATH . 'plugins.xml', $pluginsXml->asXML());
if ($return === false) SC_Utils_Ex::sfDispException();
-
return $return;
}
Index: /branches/version-2_5-dev/data/class/SC_Display.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_Display.php (revision 19670)
+++ /branches/version-2_5-dev/data/class/SC_Display.php (revision 19675)
@@ -45,5 +45,5 @@
* @param $page LC_Page
*/
- function hoge(LC_Page $page, $is_admin = false){
+ function hoge($page, $is_admin = false){
if(!$this->deviceSeted || !is_null($this->view)){
$device = ($is_admin) ? 8 : $this->detectDevice();
@@ -66,5 +66,5 @@
}
- function addHeader(String $name,String $value){
+ function addHeader($name, $value){
$this->response->addHeader($name, $value);
}
@@ -93,5 +93,5 @@
}
- function setView(SC_View $view){
+ function setView($view){
$this->view = $view;
Index: /branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php (revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php (revision 19675)
@@ -439,6 +439,6 @@
}
// 取得範囲の指定(開始行番号、行数のセット)
- $objQuery->setLimitOffset($this->disp_number, $startno)
- ->setWhere($where);
+ $objQuery->setLimitOffset($this->disp_number, $startno);
+ $objQuery->setWhere($where);
// 表示すべきIDとそのIDの並び順を一気に取得
Index: /branches/version-2_5-dev/data/class/SC_CartSession.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_CartSession.php (revision 19670)
+++ /branches/version-2_5-dev/data/class/SC_CartSession.php (revision 19675)
@@ -480,5 +480,5 @@
* @return array カートの計算結果の配列
*/
- function calculate($productTypeId, &$objCustomer = null, $use_point = 0,
+ function calculate($productTypeId, &$objCustomer, $use_point = 0,
$deliv_pref = "", $payment_id = "", $charge = 0, $discount = 0) {
$objDb = new SC_Helper_DB_Ex();
Index: /branches/version-2_5-dev/data/class/SC_Query.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_Query.php (revision 19670)
+++ /branches/version-2_5-dev/data/class/SC_Query.php (revision 19675)
@@ -658,8 +658,8 @@
*/
function setVal($seq_name, $start) {
- $this->conn->loadModule('Manager');
+ $objManager =& $this->conn->loadModule('Manager');
// XXX エラーハンドリングを行う
- $this->conn->dropSequence($seq_name);
- return $this->conn->createSequence($seq_name, $start);
+ $objManager->dropSequence($seq_name);
+ return $objManager->createSequence($seq_name, $start);
}
@@ -696,6 +696,6 @@
*/
function listSequences() {
- $this->conn->loadModule('Manager');
- return $this->conn->listSequences();
+ $objManager =& $this->conn->loadModule('Manager');
+ return $objManager->listSequences();
}
@@ -706,6 +706,6 @@
*/
function listTables() {
- $this->conn->loadModule('Manager');
- return $this->conn->listTables();
+ $objManager =& $this->conn->loadModule('Manager');
+ return $objManager->listTables();
}
@@ -717,6 +717,6 @@
*/
function listTableFields($table) {
- $this->conn->loadModule('Manager');
- return $this->conn->listTableFields($table);
+ $objManager =& $this->conn->loadModule('Manager');
+ return $objManager->listTableFields($table);
}
@@ -728,6 +728,6 @@
*/
function listTableIndexes($table) {
- $this->conn->loadModule('Manager');
- return $this->conn->listTableIndexes($table);
+ $objManager =& $this->conn->loadModule('Manager');
+ return $objManager->listTableIndexes($table);
}
@@ -740,6 +740,6 @@
*/
function createIndex($table, $name, $definition) {
- $this->conn->loadModule('Manager');
- return $this->conn->createIndex($table, $name, $definition);
+ $objManager =& $this->conn->loadModule('Manager');
+ return $objManager->createIndex($table, $name, $definition);
}
@@ -751,6 +751,6 @@
*/
function dropIndex($table, $name) {
- $this->conn->loadModule('Manager');
- return $this->conn->dropIndex($table, $name);
+ $objManager =& $this->conn->loadModule('Manager');
+ return $objManager->dropIndex($table, $name);
}
Index: /branches/version-2_5-dev/data/module/MDB2/Driver/pgsql.php
===================================================================
--- /branches/version-2_5-dev/data/module/MDB2/Driver/pgsql.php (revision 18754)
+++ /branches/version-2_5-dev/data/module/MDB2/Driver/pgsql.php (revision 19675)
@@ -930,5 +930,7 @@
$pgtypes[] = $this->datatype->mapPrepareDatatype($types[$parameter]);
} else {
- $pgtypes[] = 'text';
+ if (version_compare(PHP_VERSION, '5.0.0', '>')) {
+ $pgtypes[] = 'text';
+ }
}
}