Changeset 19675 for branches/version-2_5-dev/data/class/util

Timestamp:

2010/11/18 20:37:07 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19674

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/SC_Display.php 18986@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2Fclass%2FSC_Display.php
data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/SC_Response.php 18986@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2Fclass%2FSC_Response.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/module/MDB2/Driver/pgsql.php pgsql.php-20100706081907-4gdfmx4t4tyz1x8a-14
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
patches/MDB2_Driver_pgsql.php.patch mdb2_driver_pgsql.ph-20101118112629-azips61wd3pc7ri9-1

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2405

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-11-18 20:37:01.581000090 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-11-18T11:37:01.581000Z

Message:

• PHP4対応(#854)
  • MDB2 の PostgreSQL 用ドライバを修正したため, パッチを添付
• r19661 で発生した typo 修正

File:

• branches/version-2_5-dev/data/class/util/SC_Utils.php (modified) (2 diffs)

branches/version-2_5-dev/data/class/util/SC_Utils.php

@@ -2247 +2247 @@
      */
     function sfPutPluginsXml($pluginsXml) {
-        if (!($pluginsXml instanceof SimpleXMLElement)) SC_Utils_Ex::sfDispException();
+        if (version_compare(PHP_VERSION, '5.0.0', '>')) {
+           return;
+        }
 
         $xml = $pluginsXml->asXML();
@@ -2254 +2256 @@
         $return = file_put_contents(PLUGIN_PATH . 'plugins.xml', $pluginsXml->asXML());
         if ($return === false) SC_Utils_Ex::sfDispException();
-
         return $return;
     }