Old cached ParserOutput entries will have null for mHeadItems instead of an array.

We could force them to clear from cache by bumping the parser version, but that
shouldn't be necessary here; just casting to (array) to avoid spewing warnings.

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b565e2a..c7f7cbc 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -367,7 +367,7 @@ class OutputPage {
                        $this->mSubtitle .= $parserOutput->mSubtitle ;
                }
                $this->mNoGallery = $parserOutput->getNoGallery();
-               $this->mHeadItems = array_merge( $this->mHeadItems, $parserOutput->mHeadItems );
+               $this->mHeadItems = array_merge( $this->mHeadItems, (array)$parserOutput->mHeadItems );
                wfRunHooks( 'OutputPageParserOutput', array( &$this, $parserOutput ) );
        }