Changeset 20038 for branches/version-2_5-dev/data/class/SC_Query.php

Timestamp:

2011/01/27 15:49:19 (15 years ago)

Author:

nanasess

bzr:base-revision:

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

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_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Category.php
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
docs/eccube-diagram.jude eccubediagram.jude-20101102081620-jpq1fqmox6ocmuj3-2
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2766

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_CartSession.php [email protected]
data/class/SC_Query.php [email protected]
data/class/helper/SC_Helper_DB.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php [email protected]
data/mtb_constants_init.php [email protected]
html/install/sql/insert_data.sql [email protected]

bzr:timestamp:

2011-01-27 15:49:15.256999969 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-27T06:49:15.257000Z

Message:

#628(未使用処理・定義などの削除)

• ODERSTATUS_COMMIT を削除

#644(変数の定義・初期化を行なう)

• Notice や Warning を修正

File:

• branches/version-2_5-dev/data/class/SC_Query.php (modified) (1 diff)

branches/version-2_5-dev/data/class/SC_Query.php

@@ -97 +97 @@
      */
     function getSingletonInstance($dsn = "", $force_run = false, $new = false) {
-        if (is_null($this->instance)) {
+        if (!isset($this->instance) || is_null($this->instance)) {
             $this->instance =& new SC_Query($dsn, $force_run, $new);
         }