Merge branch '26STABLE-wip-MDL45846' of git://github.com/jennymgray/m…

…oodle into MOODLE_26_STABLE
moodle · Jun 10, 2014 · fde8076 · fde8076
2 parents 2f3c3ab + 1d20e99
commit fde8076
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/lib/classes/useragent.php b/lib/classes/useragent.php
@@ -120,7 +120,12 @@ public static function instance($reload = false, $forceuseragent = null) {
     protected function __construct($forceuseragent = null) {
         global $CFG;
         if (!empty($CFG->devicedetectregex)) {
-            $this->devicetypecustoms = json_decode($CFG->devicedetectregex);
+            $this->devicetypecustoms = json_decode($CFG->devicedetectregex, true);
+        }
+        if ($this->devicetypecustoms === null) {
+            // This shouldn't happen unless you're hardcoding the config value.
+            debugging('Config devicedetectregex is not valid JSON object');
+            $this->devicetypecustoms = array();
         }
         if ($forceuseragent !== null) {
             $this->useragent = $forceuseragent;

diff --git a/lib/tests/theme_config_test.php b/lib/tests/theme_config_test.php
@@ -126,4 +126,31 @@ public function test_svg_image_use() {
             }
         }
     }
+
+    /**
+     * This function will test custom device detection regular expression setting.
+     */
+    public function test_devicedetectregex() {
+        global $CFG;
+
+        $this->resetAfterTest();
+
+        // Check config currently empty.
+        $this->assertEmpty(json_decode($CFG->devicedetectregex));
+        $this->assertTrue(core_useragent::set_user_device_type('tablet'));
+        $exceptionoccured = false;
+        try {
+            core_useragent::set_user_device_type('featurephone');
+        } catch (moodle_exception $e) {
+            $exceptionoccured = true;
+        }
+        $this->assertTrue($exceptionoccured);
+
+        // Set config and recheck.
+        $config = array('featurephone' => '(Symbian|MIDP-1.0|Maemo|Windows CE)');
+        $CFG->devicedetectregex = json_encode($config);
+        core_useragent::instance(true); // Clears singleton cache.
+        $this->assertTrue(core_useragent::set_user_device_type('tablet'));
+        $this->assertTrue(core_useragent::set_user_device_type('featurephone'));
+    }
 }