From a4edbfa031eb4cd72678051f1510afde4f77951e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 28 Feb 2014 08:36:29 +0100
Subject: Update to MediaWiki 1.22.3

---
 includes/installer/WebInstallerPage.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'includes/installer')

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index ad399133..d3b550fe 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -955,11 +955,16 @@ class WebInstaller_Options extends WebInstallerPage {
 			LinkCache::singleton()->useDatabase( false );
 
 			foreach ( $extensions as $ext ) {
+				if ( isset( $ext['descriptionmsg'] ) ) {
+					$desc = wfMessage( $ext['descriptionmsg'] )->useDatabase( false )->parse();
+				} else {
+					$desc = '';
+				}
 				$extHtml .= $this->parent->getCheckBox( array(
 						'var' => "ext-{$ext['name']}",
 						'rawtext' => "<b>{$ext['name']}</b>: " .
-						wfMessage( $ext['descriptionmsg'] )->useDatabase( false )->parse(),
-					) );
+						$desc,
+				) );
 
 			}
 
-- 
cgit v1.2.2