Merge branch 'MDL-45409-master' of git://github.com/ankitagarwal/moodle

2014-05-06 12:19:58 +08:00
parent e4f1dd46b0 5793538a59
commit e7efd59b51
1 changed files with 8 additions and 1 deletions
@@ -1193,7 +1193,14 @@ class cm_info implements IteratorAggregate {
        // Make sure dynamic properties are retrieved prior to view properties.
        $this->obtain_dynamic_data();
        $ret = array();
-        foreach (self::$standardproperties as $key => $unused) {
+
+        // Do not iterate over deprecated properties.
+        $props = self::$standardproperties;
+        unset($props['showavailability']);
+        unset($props['availablefrom']);
+        unset($props['availableuntil']);
+
+        foreach ($props as $key => $unused) {
            $ret[$key] = $this->__get($key);
        }
        return new ArrayIterator($ret);