[Svn-src-all:2760] [version-2_12-dev 21659] #1613 (typo修正・ソース整形・ソースコメントの改善)
Seasoft
admin ＠ mail.ec-cube.net
2012年 3月 20日 (火) 00:37:33 JST
Subversion committed to /home/svn/open 21659
http://svn.ec-cube.net/open_trac/changeset/21659
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-03-20 00:37:32 +0900 (火, 20 3月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
U branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
U branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php
U branches/version-2_12-dev/data/class/util/SC_Utils.php
U branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php
U branches/version-2_12-dev/test/createEcCubeData-v25.php
変更: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2012-03-19 15:30:27 UTC (rev 21658)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2012-03-19 15:37:32 UTC (rev 21659)
@@ -281,6 +281,6 @@
$objErr->doFunc(array('緯度', 'latitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK'));
$objErr->doFunc(array('経度', 'longitude', STEXT_LEN), array('NUM_POINT_CHECK', 'MAX_LENGTH_CHECK'));
- return array_merge((array)$arrErr, (array)$objErr->arrErr);
+ return array_merge((array)$arrErr, (array)$objErr->arrErr);
}
}
変更: branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php 2012-03-19 15:30:27 UTC (rev 21658)
+++ branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php 2012-03-19 15:37:32 UTC (rev 21659)
@@ -194,7 +194,7 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->setWhere($where);
$linemax = $objProduct->findProductCount($objQuery, $bind);
- return $linemax; // 何件が該当しました。表示用
+ return $linemax; // 何件が該当しました。表示用
}
/**
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2012-03-19 15:30:27 UTC (rev 21658)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2012-03-19 15:37:32 UTC (rev 21659)
@@ -163,7 +163,7 @@
* @param SC_Product $objProduct
*/
function getTplJavascript(&$objProduct) {
- return 'productsClassCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories) . '; ';
+ return 'productsClassCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories) . '; ';
}
/**
@@ -198,7 +198,7 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->setWhere($where);
$linemax = $objProduct->findProductCount($objQuery, $bind);
- return $linemax; // 何件が該当しました。表示用
+ return $linemax; // 何件が該当しました。表示用
}
/**
変更: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php 2012-03-19 15:30:27 UTC (rev 21658)
+++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_Detail.php 2012-03-19 15:37:32 UTC (rev 21659)
@@ -367,7 +367,7 @@
/* 規格選択セレクトボックスの作成 */
function lfMakeSelect() {
- return 'fnSetClassCategories('
+ return 'fnSetClassCategories('
. 'document.form1, '
. SC_Utils_Ex::jsonEncode($this->objFormParam->getValue('classcategory_id2'))
. '); ';
変更: branches/version-2_12-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/SC_Utils.php 2012-03-19 15:30:27 UTC (rev 21658)
+++ branches/version-2_12-dev/data/class/util/SC_Utils.php 2012-03-19 15:37:32 UTC (rev 21659)
@@ -257,7 +257,7 @@
} else {
$date = '';
}
- return $date;
+ return $date;
}
/**
@@ -868,7 +868,7 @@
SC_Utils_Ex::sfDispError('');
exit;
}
- return $outpath;
+ return $outpath;
}
function sfCutString($str, $len, $byte = true, $commadisp = true) {
@@ -991,7 +991,7 @@
// PHPのmb_convert_encoding関数をSmartyでも使えるようにする
function sfMbConvertEncoding($str, $encode = 'CHAR_CODE') {
- return mb_convert_encoding($str, $encode);
+ return mb_convert_encoding($str, $encode);
}
// 2つの配列を用いて連想配列を作成する
@@ -1928,7 +1928,7 @@
*/
function isAbsoluteRealPath($realpath) {
if (strpos(PHP_OS, 'WIN') === false) {
- return (substr($realpath, 0, 1) == '/');
+ return substr($realpath, 0, 1) == '/';
} else {
return preg_match('/^[a-zA-Z]:(\\\|\/)/', $realpath) ? true : false;
}
変更: branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php
===================================================================
--- branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php 2012-03-19 15:30:27 UTC (rev 21658)
+++ branches/version-2_12-dev/test/createEcCubeCustomerData-v25.php 2012-03-19 15:37:32 UTC (rev 21659)
@@ -166,7 +166,7 @@
/** PHP4対応のための microtime 関数 */
function microtime_float() {
list($usec, $sec) = explode(" ", microtime());
- return ((float)$usec + (float)$sec);
+ return (float)$usec + (float)$sec;
}
?>
変更: branches/version-2_12-dev/test/createEcCubeData-v25.php
===================================================================
--- branches/version-2_12-dev/test/createEcCubeData-v25.php 2012-03-19 15:30:27 UTC (rev 21658)
+++ branches/version-2_12-dev/test/createEcCubeData-v25.php 2012-03-19 15:37:32 UTC (rev 21659)
@@ -657,7 +657,7 @@
/** PHP4対応のための microtime 関数 */
function microtime_float() {
list($usec, $sec) = explode(" ", microtime());
- return ((float)$usec + (float)$sec);
+ return (float)$usec + (float)$sec;
}
?>
Svn-src-all メーリングリストの案内