Changeset 20864 for branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php

Timestamp:

2011/04/19 22:57:10 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110419135231-g92tpf1uskbtyyat

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php 20543@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_UpDown.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110419135609-iv7d1syx90t5m9c5

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110419135658-o3u79g3yd6nycuw0

bzr:revno:

3575

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:text-revisions:

data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php ohkouchi@loop-az.jp-20110419135609-iv7d1syx90t5m9c5

bzr:timestamp:

2011-04-19 22:56:58.732000113 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-04-19T13:56:58.732000Z

Message:

#972 (リファクタリング開発：[管理画面]デザイン管理)

• 入力結果が上書きされていたのを修正

File:

• branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php (modified) (1 diff)

branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php

@@ -179 +179 @@
         if (!is_array($arrArchive)) {
             $arrErr['template_file'] = "※ テンプレートファイルが解凍できません。許可されている形式は、tar/tar.gzです。<br />";
-        }
-
-        $arrErr['template_file'] = $objUpFile->makeTempFile('template_file', false);
+        } else {
+            $arrErr['template_file'] = $objUpFile->makeTempFile('template_file', false);
+        }
         return $arrErr;
     }