Changeset 18794 for branches/version-2_5-dev/html/install/index.php

Timestamp:

2010/08/27 10:56:10 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100826072347-bdrmnk0g8b3llidi

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20100827013725-2fv0j8mz17eczvmd

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100827015605-jp18neo1n2pnhsjd

bzr:revno:

2277

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-parents:

html/install/index.php ohkouchi@loop-az.jp-20100825073846-mzg8ka4y21o1nk6o

bzr:text-revisions:

html/install/index.php ohkouchi@loop-az.jp-20100827013725-2fv0j8mz17eczvmd

bzr:timestamp:

2010-08-27 10:56:05.493000031 +0900

bzr:user-agent:

bzr2.1.2+bzr-svn1.0.2

svn:original-date:

2010-08-27T01:56:05.493000Z

Message:

r18790 の追加修正(#801)

• 初回DB接続時にWarningが出ていたのを修正

File:

• branches/version-2_5-dev/html/install/index.php (modified) (1 diff)

branches/version-2_5-dev/html/install/index.php

@@ -625 +625 @@
         $objQuery = new SC_Query();
         $tables = $objQuery->listTables();
-        if(in_array("dtb_baseinfo", $tables)) {
-
+
+        if(!PEAR::isError($tables) && in_array("dtb_baseinfo", $tables)) {
             $arrRet = $objQuery->select("shop_name, email01", "dtb_baseinfo");
             $shop_name = $arrRet[0]['shop_name'];