[Svn-src-all:2709] [version-2_12-dev 21608] #1613 (typo修正・ソース整形・ソースコメントの改善)
Seasoft
admin @ mail.ec-cube.net
2012年 3月 8日 (木) 00:51:35 JST
Subversion committed to /home/svn/open 21608
http://svn.ec-cube.net/open_trac/changeset/21608
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-03-08 00:51:34 +0900 (木, 08 3月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)
Changed: [U:修正,A:追加,D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/class/SC_CustomerList.php
U branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
U branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
変更: branches/version-2_12-dev/data/class/SC_CustomerList.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CustomerList.php 2012-03-07 11:40:12 UTC (rev 21607)
+++ branches/version-2_12-dev/data/class/SC_CustomerList.php 2012-03-07 15:51:34 UTC (rev 21608)
@@ -172,15 +172,15 @@
if ($mode == 'customer') {
// メルマガ受け取りの選択項目がフォームに存在する場合
if (isset($this->arrSql['search_htmlmail'])) {
- $this->setWhere('status = 2');
- if (SC_Utils_Ex::sfIsInt($this->arrSql['search_htmlmail'])) {
- $this->setWhere('mailmaga_flg = ?');
- $this->arrVal[] = $this->arrSql['search_htmlmail'];
- } else {
- // メルマガ購読拒否は省く
- $this->setWhere('mailmaga_flg <> 3');
- }
- }
+ $this->setWhere('status = 2');
+ if (SC_Utils_Ex::sfIsInt($this->arrSql['search_htmlmail'])) {
+ $this->setWhere('mailmaga_flg = ?');
+ $this->arrVal[] = $this->arrSql['search_htmlmail'];
+ } else {
+ // メルマガ購読拒否は省く
+ $this->setWhere('mailmaga_flg <> 3');
+ }
+ }
}
// 配信メールアドレス種別
変更: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2012-03-07 11:40:12 UTC (rev 21607)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2012-03-07 15:51:34 UTC (rev 21608)
@@ -317,7 +317,7 @@
* @param Integer $rank
*/
function computeRankForDelete($news_id,$rank) {
- SC_Helper_DB_Ex::sfDeleteRankRecord('dtb_news', 'news_id', $news_id);
+ SC_Helper_DB_Ex::sfDeleteRankRecord('dtb_news', 'news_id', $news_id);
}
/**
変更: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2012-03-07 11:40:12 UTC (rev 21607)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2012-03-07 15:51:34 UTC (rev 21608)
@@ -602,7 +602,7 @@
$str_ext = implode('・', $value[2]);
$this->arrErr[$value[1]][$index] = '※ ' . $value[0] . 'で許可されている形式は、' . $str_ext . 'です。<br />';
// ▲SC_CheckError::FILE_EXT_CHECK から移植
- }else{
+ } else {
$uniqname = date('mdHi') . '_' . uniqid('').'.';
$temp_file = preg_replace("/^.*\./", $uniqname, $_FILES['down_realfilename']['name'][$index]);
Svn-src-all メーリングリストの案内