diff --git a/data/class/SC_Customer.php b/data/class/SC_Customer.php index c135e15d61..af7b35a032 100644 --- a/data/class/SC_Customer.php +++ b/data/class/SC_Customer.php @@ -68,6 +68,7 @@ public function getCustomerDataFromEmailPass($pass, $email, $mobile = false) * FIXME * @return boolean 該当する会員が存在する場合は true、それ以外の場合 * は false を返す。 + * @deprecated */ public function checkMobilePhoneId() { diff --git a/data/class/SC_MobileEmoji.php b/data/class/SC_MobileEmoji.php index 81efea2718..86533174a8 100644 --- a/data/class/SC_MobileEmoji.php +++ b/data/class/SC_MobileEmoji.php @@ -29,6 +29,7 @@ /** * 携帯端末の絵文字を扱うクラス + * @deprecated */ class SC_MobileEmoji { diff --git a/data/class/SC_MobileImage.php b/data/class/SC_MobileImage.php index 12952e9153..406432abca 100644 --- a/data/class/SC_MobileImage.php +++ b/data/class/SC_MobileImage.php @@ -28,6 +28,7 @@ /** * 画像変換クラス + * @deprecated */ class SC_MobileImage { diff --git a/data/class/SC_MobileUserAgent.php b/data/class/SC_MobileUserAgent.php index bfb9e0b491..40b0dbadbb 100644 --- a/data/class/SC_MobileUserAgent.php +++ b/data/class/SC_MobileUserAgent.php @@ -41,7 +41,7 @@ class SC_MobileUserAgent */ public function getCarrier() { - trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated'); + trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED); return false; } @@ -58,7 +58,7 @@ public function getCarrier() */ public function getId() { - trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated'); + trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED); return false; } @@ -70,7 +70,7 @@ public function getId() */ public function getModel() { - trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated'); + trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED); return false; } @@ -88,7 +88,7 @@ public function getModel() */ public function isSupported() { - trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated'); + trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED); return false; } @@ -101,7 +101,7 @@ public function isSupported() */ public function isMobile() { - trigger_error(E_USER_DEPRECATED, 'Net_UserAgent_Mobile is deprecated'); + trigger_error('Net_UserAgent_Mobile is deprecated', E_USER_DEPRECATED); return false; } } diff --git a/data/class/SC_MobileView.php b/data/class/SC_MobileView.php index f4f8c3287e..96ae635ec2 100644 --- a/data/class/SC_MobileView.php +++ b/data/class/SC_MobileView.php @@ -21,6 +21,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/** + * @deprecated + */ class SC_MobileView extends SC_SiteView_Ex { public function __construct($setPrevURL = true) diff --git a/data/class/helper/SC_Helper_HandleError.php b/data/class/helper/SC_Helper_HandleError.php index ad57e5804f..85ea840752 100644 --- a/data/class/helper/SC_Helper_HandleError.php +++ b/data/class/helper/SC_Helper_HandleError.php @@ -200,21 +200,6 @@ public static function displaySystemError($errstr = null) ob_clean(); - // 絵文字変換・除去フィルターが有効か評価する。 - $loaded_ob_emoji = false; - $arrObs = ob_get_status(true); - foreach ($arrObs as $arrOb) { - if ($arrOb['name'] === 'SC_MobileEmoji::handler') { - $loaded_ob_emoji = true; - break; - } - } - - // 絵文字変換・除去フィルターが無効で、利用できる場合、有効にする。 - if (!$loaded_ob_emoji && class_exists('SC_MobileEmoji')) { - ob_start(array('SC_MobileEmoji', 'handler')); - } - require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_SystemError_Ex.php'; $objPage = new LC_Page_Error_SystemError_Ex(); $objPage->init(); diff --git a/data/class/helper/SC_Helper_Mobile.php b/data/class/helper/SC_Helper_Mobile.php index 2c6ec30104..105c56423c 100644 --- a/data/class/helper/SC_Helper_Mobile.php +++ b/data/class/helper/SC_Helper_Mobile.php @@ -27,6 +27,7 @@ * @package Helper * @author EC-CUBE CO.,LTD. * @version $Id$ + * @deprecated */ class SC_Helper_Mobile { diff --git a/data/class/sessionfactory/SC_SessionFactory_UseRequest.php b/data/class/sessionfactory/SC_SessionFactory_UseRequest.php index 0a206b5d1f..82f67bfb88 100644 --- a/data/class/sessionfactory/SC_SessionFactory_UseRequest.php +++ b/data/class/sessionfactory/SC_SessionFactory_UseRequest.php @@ -31,6 +31,7 @@ * @package SC_SessionFactory * @author EC-CUBE CO.,LTD. * @version $Id$ + * @deprecated */ class SC_SessionFactory_UseRequest extends SC_SessionFactory_Ex { diff --git a/data/include/image_converter.inc b/data/include/image_converter.inc index ee6ad474ce..27f9b127a5 100644 --- a/data/include/image_converter.inc +++ b/data/include/image_converter.inc @@ -1,6 +1,7 @@ sfMobileInit(); - } -}