diff options
| author | root | 2019-02-19 18:53:50 +0100 |
|---|---|---|
| committer | root | 2019-02-19 18:53:50 +0100 |
| commit | 0ad4c0f8196b61699754762aacbaab0223478ab9 (patch) | |
| tree | de434c4aea8d07ecd01cd3badd48d057d62c2d1b /modules-available/locationinfo/inc/coursebackend.inc.php | |
| parent | [usb-lock-off] Edit rule cleanup and fix of the dropdown boxes. (diff) | |
| parent | [statistics] Fix RAM change warning to handle increase too (diff) | |
| download | slx-admin-usb-lock-off.tar.gz slx-admin-usb-lock-off.tar.xz slx-admin-usb-lock-off.zip | |
Merge branch 'master' into usb-lock-offusb-lock-off
Diffstat (limited to 'modules-available/locationinfo/inc/coursebackend.inc.php')
| -rw-r--r-- | modules-available/locationinfo/inc/coursebackend.inc.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules-available/locationinfo/inc/coursebackend.inc.php b/modules-available/locationinfo/inc/coursebackend.inc.php index 7162c885..dcd92f6f 100644 --- a/modules-available/locationinfo/inc/coursebackend.inc.php +++ b/modules-available/locationinfo/inc/coursebackend.inc.php @@ -334,7 +334,7 @@ abstract class CourseBackend { $cleanresponse = preg_replace('/(<\/?)(\w+):([^>]*>)/', '$1$2$3', $response); try { - $xml = new SimpleXMLElement($cleanresponse); + $xml = @new SimpleXMLElement($cleanresponse); // This spams before throwing exception } catch (Exception $e) { $this->error = 'Could not parse reply as XML, got ' . get_class($e) . ': ' . $e->getMessage(); if (CONFIG_DEBUG) { @@ -370,6 +370,9 @@ class BackendProperty { * @param mixed $current current value of this property. */ public function initForRender($current = null) { + if ($current === null) { + $current = $this->default; + } if (is_array($this->type)) { $this->template = 'dropdown'; $this->select_list = []; @@ -391,7 +394,7 @@ class BackendProperty { } elseif ($this->type === 'password') { $this->inputtype = Property::getPasswordFieldType(); } - $this->currentvalue = $current === null ? $this->default : $current; + $this->currentvalue = $current; } public $inputtype; public $template; |