r62604 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r62603‎ | r62604 | r62605 >
Date:22:06, 16 February 2010
Author:ialex
Status:ok
Tags:
Comment:
* Fixed some doxygen warnings
* Consistency in documentation
Modified paths:
  • /trunk/phase3/includes/Interwiki.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Interwiki.php
@@ -26,9 +26,9 @@
2727
2828 /**
2929 * Check whether an interwiki prefix exists
30 - *
31 - * @return bool Whether it exists
32 - * @param $prefix string Interwiki prefix to use
 30+ *
 31+ * @param $prefix String: interwiki prefix to use
 32+ * @return Boolean: whether it exists
3333 */
3434 static public function isValidInterwiki( $prefix ) {
3535 $result = self::fetch( $prefix );
@@ -37,9 +37,9 @@
3838
3939 /**
4040 * Fetch an Interwiki object
41 - *
 41+ *
 42+ * @param $prefix String: interwiki prefix to use
4243 * @return Interwiki Object, or null if not valid
43 - * @param $prefix string Interwiki prefix to use
4444 */
4545 static public function fetch( $prefix ) {
4646 global $wgContLang;
@@ -72,8 +72,8 @@
7373 *
7474 * @note More logic is explained in DefaultSettings.
7575 *
76 - * @param $prefix \type{\string} Interwiki prefix
77 - * @return \type{\Interwiki} An interwiki object
 76+ * @param $prefix String: interwiki prefix
 77+ * @return Interwiki object
7878 */
7979 protected static function getInterwikiCached( $prefix ) {
8080 $value = self::getInterwikiCacheEntry( $prefix );
@@ -95,8 +95,8 @@
9696 *
9797 * @note More logic is explained in DefaultSettings.
9898 *
99 - * @param $prefix \type{\string} Database key
100 - * @return \type{\string) The entry
 99+ * @param $prefix String: database key
 100+ * @return String: the entry
101101 */
102102 protected static function getInterwikiCacheEntry( $prefix ) {
103103 global $wgInterwikiCache, $wgInterwikiScopes, $wgInterwikiFallbackSite;
@@ -133,8 +133,7 @@
134134 * Load the interwiki, trying first memcached then the DB
135135 *
136136 * @param $prefix The interwiki prefix
137 - * @return bool The prefix is valid
138 - * @static
 137+ * @return Boolean: the prefix is valid
139138 */
140139 protected static function load( $prefix ) {
141140 global $wgMemc, $wgInterwikiExpiry;
@@ -165,9 +164,8 @@
166165 /**
167166 * Fill in member variables from an array (e.g. memcached result, Database::fetchRow, etc)
168167 *
169 - * @return bool Whether everything was there
170 - * @param $res ResultWrapper Row from the interwiki table
171 - * @static
 168+ * @param $mc Associative array: row from the interwiki table
 169+ * @return Boolean: whether everything was there
172170 */
173171 protected static function loadFromArray( $mc ) {
174172 if( isset( $mc['iw_url'] ) && isset( $mc['iw_local'] ) && isset( $mc['iw_trans'] ) ) {
@@ -183,8 +181,8 @@
184182 /**
185183 * Get the URL for a particular title (or with $1 if no title given)
186184 *
187 - * @param $title string What text to put for the article name
188 - * @return string The URL
 185+ * @param $title String: what text to put for the article name
 186+ * @return String: the URL
189187 */
190188 public function getURL( $title = null ) {
191189 $url = $this->mURL;
@@ -197,7 +195,8 @@
198196 /**
199197 * Is this a local link from a sister project, or is
200198 * it something outside, like Google
201 - * @return bool
 199+ *
 200+ * @return Boolean
202201 */
203202 public function isLocal() {
204203 return $this->mLocal;
@@ -206,7 +205,8 @@
207206 /**
208207 * Can pages from this wiki be transcluded?
209208 * Still requires $wgEnableScaryTransclusion
210 - * @return bool
 209+ *
 210+ * @return Boolean
211211 */
212212 public function isTranscludable() {
213213 return $this->mTrans;
@@ -214,6 +214,7 @@
215215
216216 /**
217217 * Get the name for the interwiki site
 218+ *
218219 * @return String
219220 */
220221 public function getName() {
@@ -224,6 +225,7 @@
225226
226227 /**
227228 * Get a description for this interwiki
 229+ *
228230 * @return String
229231 */
230232 public function getDescription() {

Status & tagging log