Merge branch 'wip-MDL-38075-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

2013-02-20 00:07:47 +01:00
parent 8e628ee242 fd6d738db4
commit 950fead105
1 changed files with 7 additions and 1 deletions
@@ -1747,7 +1747,13 @@ class css_rule {
        $css = $this->out();
        $errors = array();
        foreach ($this->styles as $style) {
-            if ($style->has_error()) {
+            if (is_array($style)) {
+                foreach ($style as $s) {
+                    if ($style instanceof css_style && $style->has_error()) {
+                        $errors[] = "  * ".$style->get_last_error();
+                    }
+                }
+            } else if ($style instanceof css_style && $style->has_error()) {
                $errors[] = "  * ".$style->get_last_error();
            }
        }