From e70787791275c1a68f607cce004214a7d0e23d63 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Tue, 11 Jan 2011 13:51:49 +0000 Subject: [PATCH] Followup r80003: array_unique() preserves keys, so we got module arrays that looked like {"0": "ext.liquidThreads", "58": "mediawiki.legacy.wikibits", "59": "mediawiki.util", ... } . To prevent this from happening, use array_values() to reindex the arrays --- includes/OutputPage.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 6d28ced2b8..d652be89fe 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -233,7 +233,7 @@ class OutputPage { * @return Array of module names */ public function getModules() { - return array_unique( $this->mModules ); + return array_values( array_unique( $this->mModules ) ); } /** @@ -252,7 +252,7 @@ class OutputPage { * @return array of module names */ public function getModuleScripts() { - return array_unique( $this->mModuleScripts ); + return array_values( array_unique( $this->mModuleScripts ) ); } /** @@ -272,7 +272,7 @@ class OutputPage { * @return Array of module names */ public function getModuleStyles() { - return array_unique( $this->mModuleStyles ); + return array_values( array_unique( $this->mModuleStyles ) ); } /** @@ -292,7 +292,7 @@ class OutputPage { * @return Array of module names */ public function getModuleMessages() { - return array_unique( $this->mModuleMessages ); + return array_values( array_unique( $this->mModuleMessages ) ); } /** -- 2.20.1