Fixing an incorrect concatenate of CSS classes arrays

array + array does not add new items if their numeric keys are the same. This
lead to the bug that add_classes() did not work correctly.

diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index bc1618d2d57e5b12de55285c401cef0f625d22cc..df9d76297af21240dcc5c6d1bbc7738969789f00 100644 (file)
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -109,7 +109,7 @@ class moodle_html_component {
      * @return void
      */
     public function add_classes($classes) {
-        $this->classes += self::clean_classes($classes);
+        $this->classes = array_merge($this->classes, self::clean_classes($classes));
     }
 
     /**