Changeset 20039

Timestamp:

2011/01/27 19:34:35 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110127064915-nskr56ok5ueik4oz

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_Initial.php 16506@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Initial.php
data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
html/handle_error.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fhtml%2Fhandle_error.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110127093038-qudrjuxlln6vov91

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110127103430-uzpyuy5s5gn73krx

bzr:revno:

2767

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_Query.php ohkouchi@loop-az.jp-20110127093038-qudrjuxlln6vov91

bzr:timestamp:

2011-01-27 19:34:30.812000036 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-27T10:34:30.812000Z

Message:

#642(共通ロジックの機能向上)

• $this->instance が他クラスのメンバ変数を参照していたのを修正

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 (!isset($this->instance) || is_null($this->instance)) {
-            $this->instance =& new SC_Query($dsn, $force_run, $new);
-        }
-        $this->instance->where = "";
-        $this->instance->order = "";
-        $this->instance->groupby = "";
-        $this->instance->option = "";
-        return $this->instance;
+        if (!isset($GLOBALS['_SC_Query_instance'])
+            || is_null($GLOBALS['_SC_Query_instance'])) {
+            $GLOBALS['_SC_Query_instance'] =& new SC_Query($dsn, $force_run, $new);
+        }
+        $GLOBALS['_SC_Query_instance']->where = "";
+        $GLOBALS['_SC_Query_instance']->order = "";
+        $GLOBALS['_SC_Query_instance']->groupby = "";
+        $GLOBALS['_SC_Query_instance']->option = "";
+        return $GLOBALS['_SC_Query_instance'];
     }