Ignore:
Timestamp:
2011/04/21 20:53:08 (10 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:20884
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/mobile/mypage/change.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fmypage%2Fchange.tpl
data/Smarty/templates/mobile/mypage/change_confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fmypage%2Fchange_confirm.tpl
data/class/helper/SC_Helper_Customer.php 19864@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Customer.php
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-20110421114225-070ogiwdu344i5rq
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110421115305-05rkfwvld21yqhie
bzr:revno:
3596
bzr:revprop:branch-nick:
branches/version-2_11-dev
bzr:root:
branches/version-2_11-dev
bzr:text-revisions:

data/Smarty/templates/mobile/mypage/change.tpl ohkouchi@loop-az.jp-20110421114225-070ogiwdu344i5rq
data/Smarty/templates/mobile/mypage/change_confirm.tpl ohkouchi@loop-az.jp-20110421114225-070ogiwdu344i5rq
data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php ohkouchi@loop-az.jp-20110421114225-070ogiwdu344i5rq
bzr:timestamp:
2011-04-21 20:53:05.354000092 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-04-21T11:53:05.354000Z
Message:

#1233 (モバイル>メールアドレス変更の仕様の確認)

  • モバイル版マイページでは, PCメールアドレスは非表示に修正
  • 携帯メールアドレスの入力チェックに MOBILE_EMAIL_CHECK が抜けていたため修正

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

  • r20864 の続き. 返り値の処理を修正
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php

    r20864 r20885  
    180180            $arrErr['template_file'] = "※ テンプレートファイルが解凍できません。許可されている形式は、tar/tar.gzです。<br />"; 
    181181        } else { 
    182             $arrErr['template_file'] = $objUpFile->makeTempFile('template_file', false); 
     182            $make_temp_error = $objUpFile->makeTempFile('template_file', false); 
     183            if (!SC_Utils_Ex::isBlank($make_temp_error)) { 
     184                $arrErr['template_file'] = $make_temp_error; 
     185            } 
    183186        } 
    184187        return $arrErr; 
Note: See TracChangeset for help on using the changeset viewer.