Merge pull request #243 from nanasess/remove-obsoult-packages

Remove obsolete packages
EC-CUBE · Feb 25, 2019 · 19a4124 · 19a4124
2 parents 390bde4 + 2247a97
commit 19a4124
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 391 deletions.
diff --git a/composer.json b/composer.json
@@ -29,10 +29,7 @@
         "bondas83/mdb2_driver_mysqli": "^1.5",
         "mobiledetect/mobiledetectlib": "^2.8",
         "nanasess/mdb2_driver_pgsql": "^1.5",
-        "nanasess/net_useragent_mobile": "*",
-        "nanasess/services_json": "*",
         "pear/archive_tar": "^1.4.3",
-        "pear/cache_lite": "*",
         "pear/mail": "*",
         "pear/pear-core-minimal": "^1.10",
         "pear/text_password": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/data/class/SC_Cache.php b/data/class/SC_Cache.php
diff --git a/data/class/SC_Display.php b/data/class/SC_Display.php
@@ -153,9 +153,7 @@ public static function detectDevice($reset = FALSE)
         if (is_null(SC_Display_Ex::$device) || $reset) {
             //$nu = new Net_UserAgent_Mobile();
             $su = new SC_SmartphoneUserAgent_Ex();
-            /*if ($nu->isMobile()) {
-                SC_Display_Ex::$device = DEVICE_TYPE_MOBILE;
-            } else*/if ($su->isSmartphone()) {
+            if ($su->isSmartphone()) {
                 SC_Display_Ex::$device = DEVICE_TYPE_SMARTPHONE;
             } else {
                 SC_Display_Ex::$device = DEVICE_TYPE_PC;