From: Antoine Musso <hashar@users.mediawiki.org>
Date: Wed, 23 Nov 2011 15:53:03 +0000 (+0000)
Subject: User: document 2 returns
X-Git-Tag: 1.31.0-rc.0~26328
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=61ef7cb30508ffca10634d34651a5ac7d9571810;p=lhc%2Fweb%2Fwiklou.git

User: document 2 returns
---

diff --git a/includes/User.php b/includes/User.php
index 229868fd5c..0546424466 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -393,7 +393,7 @@ class User {
 	 * If the code is invalid or has expired, returns NULL.
 	 *
 	 * @param $code String Confirmation code
-	 * @return User
+	 * @return User object, or null
 	 */
 	public static function newFromConfirmationCode( $code ) {
 		$dbr = wfGetDB( DB_SLAVE );
@@ -414,7 +414,7 @@ class User {
 	 *
 	 * @param $request WebRequest object to use; $wgRequest will be used if
 	 *        ommited.
-	 * @return User
+	 * @return User object
 	 */
 	public static function newFromSession( WebRequest $request = null ) {
 		$user = new User;