Changeset 20039


Ignore:
Timestamp:
2011/01/27 19:34:35 (10 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/SC_Query.php

    r20038 r20039  
    9797     */ 
    9898    function getSingletonInstance($dsn = "", $force_run = false, $new = false) { 
    99         if (!isset($this->instance) || is_null($this->instance)) { 
    100             $this->instance =& new SC_Query($dsn, $force_run, $new); 
    101         } 
    102         $this->instance->where = ""; 
    103         $this->instance->order = ""; 
    104         $this->instance->groupby = ""; 
    105         $this->instance->option = ""; 
    106         return $this->instance; 
     99        if (!isset($GLOBALS['_SC_Query_instance']) 
     100            || is_null($GLOBALS['_SC_Query_instance'])) { 
     101            $GLOBALS['_SC_Query_instance'] =& new SC_Query($dsn, $force_run, $new); 
     102        } 
     103        $GLOBALS['_SC_Query_instance']->where = ""; 
     104        $GLOBALS['_SC_Query_instance']->order = ""; 
     105        $GLOBALS['_SC_Query_instance']->groupby = ""; 
     106        $GLOBALS['_SC_Query_instance']->option = ""; 
     107        return $GLOBALS['_SC_Query_instance']; 
    107108    } 
    108109 
Note: See TracChangeset for help on using the changeset viewer.