MDL-45846 Libraries custom user agent device detection unit test added

2014-06-09 13:59:10 +01:00
parent d983601e46
commit 82c0485aab
2 changed files with 32 additions and 0 deletions
@@ -122,6 +122,11 @@ class core_useragent {
        if (!empty($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;
        } else if (!empty($_SERVER['HTTP_USER_AGENT'])) {