From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 11 May 2012 20:16:19 +0000 (+0200)
Subject: add Interwiki::selectFields
X-Git-Tag: 1.31.0-rc.0~23637^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=38a2cd320a38a7f73172e9a4d2871fa758dc3680;p=lhc%2Fweb%2Fwiklou.git

add Interwiki::selectFields

to avoid * inside select

Change-Id: I9d0ac631d9389744f68d744fa1d3fa3e3866a956
---

diff --git a/includes/interwiki/Interwiki.php b/includes/interwiki/Interwiki.php
index 179ff4cbc9..076e23fe29 100644
--- a/includes/interwiki/Interwiki.php
+++ b/includes/interwiki/Interwiki.php
@@ -181,7 +181,7 @@ class Interwiki {
 
 		$db = wfGetDB( DB_SLAVE );
 
-		$row = $db->fetchRow( $db->select( 'interwiki', '*', array( 'iw_prefix' => $prefix ),
+		$row = $db->fetchRow( $db->select( 'interwiki', self::selectFields(), array( 'iw_prefix' => $prefix ),
 			__METHOD__ ) );
 		$iw = Interwiki::loadFromArray( $row );
 		if ( $iw ) {
@@ -305,7 +305,7 @@ class Interwiki {
 		}
 
 		$res = $db->select( 'interwiki',
-			array( 'iw_prefix', 'iw_url', 'iw_api', 'iw_wikiid', 'iw_local', 'iw_trans' ),
+			self::selectFields(),
 			$where, __METHOD__, array( 'ORDER BY' => 'iw_prefix' )
 		);
 		$retval = array();
@@ -406,4 +406,20 @@ class Interwiki {
 		$msg = wfMessage( 'interwiki-desc-' . $this->mPrefix )->inContentLanguage();
 		return !$msg->exists() ? '' : $msg;
 	}
+
+	/**
+	 * Return the list of interwiki fields that should be selected to create
+	 * a new interwiki object.
+	 * @return array
+	 */
+	public static function selectFields() {
+		return array(
+			'iw_prefix',
+			'iw_url',
+			'iw_api',
+			'iw_wikiid',
+			'iw_local',
+			'iw_trans'
+		);
+	}
 }