Changeset 22348 for branches/version-2_12-dev

Timestamp:

2013/01/24 18:41:40 (11 years ago)

Author:

nanasess

bzr:base-revision:

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

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:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20130124094136-pj8pefewmkp8usyh

bzr:revno:

4826

bzr:revprop:branch-nick:

branches/version-2_12-dev

bzr:root:

branches/version-2_12-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20130124094136-pj8pefewmkp8usyh
sha1: 276f5cb03ae057fa1b361f8133f07349b5ab6972

bzr:timestamp:

2013-01-24 18:41:36.588999987 +0900

bzr:user-agent:

bzr2.5.1+bzr-svn1.2.2

Message:

#1999 (インストーラのDBクリーンアップ時に Warning が出る)

• r22261, r22347 をマージ

File:

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

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

@@ -198 +198 @@
 
         //マスターデータのキャッシュを削除
-        $cache_dir = '../../data/cache/';
+        $cache_dir = DATA_REALDIR . 'cache/';
         $res_dir = opendir($cache_dir);
         while ($file_name = readdir($res_dir)){
             //dummy以外は削除
             if ($file_name != 'dummy'){
-                unlink($cache_dir . $file_name);
+                if (is_file($cache_dir . $file_name)) {
+                    unlink($cache_dir . $file_name);
+                }
             }
         }