Changeset 21302
- Timestamp:
- 2011/10/28 18:58:18 (11 years ago)
- Location:
- branches/version-2_11-dev/data
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_11-dev/data/class/SC_MobileUserAgent.php
r20764 r21302 117 117 */ 118 118 function isNonMobile() { 119 /** 120 * ここは、自クラスのメソッドの逆関数なので、 121 * EC-CUBE標準規約/リファクタリングガイドラインの 122 * SC_Display_Ex::detectDevice()への統一からは除外。 123 */ 119 124 return !SC_MobileUserAgent_Ex::isMobile(); 120 125 } -
branches/version-2_11-dev/data/class/SC_Response.php
r20970 r21302 150 150 151 151 $session = SC_SessionFactory::getInstance(); 152 if (SC_MobileUserAgent_Ex::isMobile() || $session->useCookie() == false) { 152 if ((SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) 153 || ($session->useCookie() == false) 154 ) { 153 155 $netUrl->addQueryString(session_name(), session_id()); 154 156 } -
branches/version-2_11-dev/data/class/helper/SC_Helper_Mail.php
r21185 r21302 150 150 $arrTplVar->tpl_user_point = $objCustomer->getValue('point'); 151 151 152 if (Net_UserAgent_Mobile::isMobile() === true) {152 if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { 153 153 $objMailView = new SC_MobileView_Ex(); 154 154 } else { -
branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php
r21259 r21302 431 431 } 432 432 433 if (Net_UserAgent_Mobile::isMobile() 434 && in_array('email', $keys)) { 433 if ((SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) 434 && in_array('email', $keys) 435 ) { 435 436 $email_mobile = $objCustomer->getValue('email_mobile'); 436 437 if (empty($email_mobile)) { … … 1060 1061 function sendOrderMail($orderId) { 1061 1062 $mailHelper = new SC_Helper_Mail_Ex(); 1062 $mailHelper->sfSendOrderMail($orderId, 1063 SC_MobileUserAgent_Ex::isMobile() ? 2 : 1); 1063 $template_id = 1064 SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ? 2 : 1; 1065 $mailHelper->sfSendOrderMail($orderId, $template_id); 1064 1066 } 1065 1067 -
branches/version-2_11-dev/data/class/session/SC_SessionFactory.php
r21010 r21302 74 74 case 'useCookie': 75 75 // モバイルの場合はSC_SessionFactory_UseRequestを使用する 76 if ( Net_UserAgent_Mobile::isMobile()===true) {76 if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { 77 77 $session = new SC_SessionFactory_UseRequest; 78 78 $session->setState('mobile'); -
branches/version-2_11-dev/data/smarty_extends/modifier.numeric_emoji.php
r18234 r21302 13 13 static $numeric_emoji_index = array('134', '125', '126', '127', '128', '129', '130', '131', '132', '133'); 14 14 15 if (SC_MobileUserAgent::isMobile() && isset($numeric_emoji_index[$value])) { 15 if ((SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) 16 && isset($numeric_emoji_index[$value]) 17 ) { 16 18 return '[emoji:' . $numeric_emoji_index[$value] . ']'; 17 19 } else {
Note: See TracChangeset
for help on using the changeset viewer.