r38753 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r38752‎ | r38753 | r38754 >
Date:08:22, 7 August 2008
Author:krimpet
Status:old
Tags:
Comment:
Finishing touches on User.php documentation
Modified paths:
  • /trunk/phase3/includes/User.php (modified) (history)
  • /trunk/phase3/maintenance/Doxyfile (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/Doxyfile
——@@ -16,7 +16,7 @@
1717 PROJECT_NAME = MediaWiki
1818 PROJECT_NUMBER = {{CURRENT_VERSION}}
1919 OUTPUT_DIRECTORY = {{OUTPUT_DIRECTORY}}
20 -CREATE_SUBDIRS = NO
 20+CREATE_SUBDIRS = YES
2121 OUTPUT_LANGUAGE = English
2222 BRIEF_MEMBER_DESC = YES
2323 REPEAT_BRIEF = YES
——@@ -175,7 +175,7 @@
176176 HHC_LOCATION =
177177 GENERATE_CHI = NO
178178 BINARY_TOC = NO
179 -TOC_EXPAND = NO
 179+TOC_EXPAND = YES
180180 DISABLE_INDEX = NO
181181 ENUM_VALUES_PER_LINE = 4
182182 GENERATE_TREEVIEW = YES
——@@ -191,8 +191,8 @@
192192 PAPER_TYPE = a4wide
193193 EXTRA_PACKAGES =
194194 LATEX_HEADER =
195 -PDF_HYPERLINKS = NO
196 -USE_PDFLATEX = NO
 195+PDF_HYPERLINKS = YES
 196+USE_PDFLATEX = YES
197197 LATEX_BATCHMODE = NO
198198 LATEX_HIDE_INDICES = NO
199199 #---------------------------------------------------------------------------
——@@ -207,7 +207,7 @@
208208 #---------------------------------------------------------------------------
209209 # configuration options related to the man page output
210210 #---------------------------------------------------------------------------
211 -GENERATE_MAN = YES
 211+GENERATE_MAN = NO
212212 MAN_OUTPUT = man
213213 MAN_EXTENSION = .3
214214 MAN_LINKS = NO
Index: trunk/phase3/includes/User.php
——@@ -461,8 +461,13 @@
462462 * addresses like this, if we allowed accounts like this to be created
463463 * new users could get the old edits of these anonymous users.
464464 *
 465+<<<<<<< .mine
 466+ * @param $name \type{\string} String to match
 467+ * @return \type{\bool} True or false
 468+=======
465469 * @param $name \type{\string}
466470 * @return \type{\bool}
 471+>>>>>>> .r38752
467472 */
468473 static function isIP( $name ) {
469474 return preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.(?:xxx|\d{1,3})$/',$name) || IP::isIPv6($name);
——@@ -476,8 +481,13 @@
477482 * is longer than the maximum allowed username size or doesn't begin with
478483 * a capital letter.
479484 *
 485+<<<<<<< .mine
 486+ * @param $name \type{\string} String to match
 487+ * @return \type{\bool} True or false
 488+=======
480489 * @param $name \type{\string}
481490 * @return \type{\bool}
 491+>>>>>>> .r38752
482492 */
483493 static function isValidUserName( $name ) {
484494 global $wgContLang, $wgMaxNameChars;
——@@ -530,8 +540,13 @@
531541 * If an account already exists in this form, login will be blocked
532542 * by a failure to pass this function.
533543 *
 544+<<<<<<< .mine
 545+ * @param $name \type{\string} String to match
 546+ * @return \type{\bool} True or false
 547+=======
534548 * @param $name \type{\string}
535549 * @return \type{\bool}
 550+>>>>>>> .r38752
536551 */
537552 static function isUsableName( $name ) {
538553 global $wgReservedUsernames;
——@@ -562,8 +577,13 @@
563578 * rather than in isValidUserName() to avoid disrupting
564579 * existing accounts.
565580 *
 581+<<<<<<< .mine
 582+ * @param $name \type{\string} String to match
 583+ * @return \type{\bool} True or false
 584+=======
566585 * @param $name \type{\string}
567586 * @return \type{\bool}
 587+>>>>>>> .r38752
568588 */
569589 static function isCreatableName( $name ) {
570590 return
——@@ -576,8 +596,13 @@
577597 /**
578598 * Is the input a valid password for this user?
579599 *
 600+<<<<<<< .mine
580601 * @param $password \type{\string} Desired password
 602+ * @return \type{\bool} True or false
 603+=======
 604+ * @param $password \type{\string} Desired password
581605 * @return \type{\bool}
 606+>>>>>>> .r38752
582607 */
583608 function isValidPassword( $password ) {
584609 global $wgMinimalPasswordLength, $wgContLang;
——@@ -602,8 +627,13 @@
603628 *
604629 * @todo Check for RFC 2822 compilance (bug 959)
605630 *
 631+<<<<<<< .mine
606632 * @param $addr \type{\string} E-mail address
 633+ * @return \type{\bool} True or false
 634+=======
 635+ * @param $addr \type{\string} E-mail address
607636 * @return \type{\bool}
 637+>>>>>>> .r38752
608638 */
609639 public static function isValidEmailAddr( $addr ) {
610640 $result = null;
——@@ -711,7 +741,11 @@
712742 * Return a random password. Sourced from mt_rand, so it's not particularly secure.
713743 * @todo hash random numbers to improve security, like generateToken()
714744 *
 745+<<<<<<< .mine
 746+ * @return \type{\string} New random password
 747+=======
715748 * @return \type{\string}
 749+>>>>>>> .r38752
716750 */
717751 static function randomPassword() {
718752 global $wgMinimalPasswordLength;
——@@ -972,8 +1006,13 @@
9731007 /**
9741008 * Get a given default option value.
9751009 *
 1010+<<<<<<< .mine
9761011 * @param $opt \type{\string} Name of option to retrieve
 1012+ * @return \type{\string} Default option value
 1013+=======
 1014+ * @param $opt \type{\string} Name of option to retrieve
9771015 * @return \type{\string}
 1016+>>>>>>> .r38752
9781017 */
9791018 public static function getDefaultOption( $opt ) {
9801019 $defOpts = self::getDefaultOptions();
——@@ -986,7 +1025,7 @@
9871026
9881027 /**
9891028 * Get a list of user toggle names
990 - * @return \arrayof{\string}
 1029+ * @return \arrayof{\string} Array of user toggle names
9911030 */
9921031 static function getToggles() {
9931032 global $wgContLang;
——@@ -1073,8 +1112,13 @@
10741113 /**
10751114 * Whether the given IP is in the SORBS blacklist.
10761115 *
 1116+<<<<<<< .mine
10771117 * @param $ip \type{\string} IP to check
 1118+ * @return \type{\bool} True if blacklisted
 1119+=======
 1120+ * @param $ip \type{\string} IP to check
10781121 * @return \type{\bool}
 1122+>>>>>>> .r38752
10791123 */
10801124 function inSorbsBlacklist( $ip ) {
10811125 global $wgEnableSorbs, $wgSorbsUrl;
——@@ -1086,9 +1130,15 @@
10871131 /**
10881132 * Whether the given IP is in a given DNS blacklist.
10891133 *
 1134+<<<<<<< .mine
10901135 * @param $ip \type{\string} IP to check
10911136 * @param $base \type{\string} URL of the DNS blacklist
 1137+ * @return \type{\bool} True if blacklisted
 1138+=======
 1139+ * @param $ip \type{\string} IP to check
 1140+ * @param $base \type{\string} URL of the DNS blacklist
10921141 * @return \type{\bool}
 1142+>>>>>>> .r38752
10931143 */
10941144 function inDnsBlacklist( $ip, $base ) {
10951145 wfProfileIn( __METHOD__ );
——@@ -1122,7 +1172,11 @@
11231173 /**
11241174 * Is this user subject to rate limiting?
11251175 *
 1176+<<<<<<< .mine
 1177+ * @return \type{\bool} True if rate limited
 1178+=======
11261179 * @return \type{\bool}
 1180+>>>>>>> .r38752
11271181 */
11281182 public function isPingLimitable() {
11291183 global $wgRateLimitsExcludedGroups;
——@@ -1311,7 +1365,11 @@
13121366
13131367 /**
13141368 * Get the user name, or the IP of an anonymous user
 1369+<<<<<<< .mine
 1370+ * @return \type{\string} User's name or IP address
 1371+=======
13151372 * @return \type{\string}
 1373+>>>>>>> .r38752
13161374 */
13171375 function getName() {
13181376 if ( !$this->mDataLoaded && $this->mFrom == 'name' ) {
——@@ -1347,7 +1405,11 @@
13481406
13491407 /**
13501408 * Get the user's name escaped by underscores.
 1409+<<<<<<< .mine
 1410+ * @return \type{\string} Username escaped by underscores
 1411+=======
13511412 * @return \type{\string}
 1413+>>>>>>> .r38752
13521414 */
13531415 function getTitleKey() {
13541416 return str_replace( ' ', '_', $this->getName() );
——@@ -1617,7 +1679,11 @@
16181680
16191681 /**
16201682 * Get the user's current token.
 1683+<<<<<<< .mine
 1684+ * @return \type{\string} Token
 1685+=======
16211686 * @return \type{\string}
 1687+>>>>>>> .r38752
16221688 */
16231689 function getToken() {
16241690 $this->load();
——@@ -1676,7 +1742,11 @@
16771743 /**
16781744 * Has password reminder email been sent within the last
16791745 * $wgPasswordReminderResendTime hours?
 1746+<<<<<<< .mine
 1747+ * @return \type{\bool} True or false
 1748+=======
16801749 * @return \type{\bool}
 1750+>>>>>>> .r38752
16811751 */
16821752 function isPasswordReminderThrottled() {
16831753 global $wgPasswordReminderResendTime;
——@@ -1690,7 +1760,11 @@
16911761
16921762 /**
16931763 * Get the user's e-mail address
 1764+<<<<<<< .mine
 1765+ * @return \type{\string} User's -mail address
 1766+=======
16941767 * @return \type{\string}
 1768+>>>>>>> .r38752
16951769 */
16961770 function getEmail() {
16971771 $this->load();
——@@ -1720,7 +1794,11 @@
17211795
17221796 /**
17231797 * Get the user's real name
 1798+<<<<<<< .mine
 1799+ * @return \type{\string} User's real name
 1800+=======
17241801 * @return \type{\string}
 1802+>>>>>>> .r38752
17251803 */
17261804 function getRealName() {
17271805 $this->load();
——@@ -1822,7 +1900,11 @@
18231901
18241902 /**
18251903 * Get the user's preferred date format.
 1904+<<<<<<< .mine
 1905+ * @return \type{\string} User's preferred date format
 1906+=======
18261907 * @return \type{\string}
 1908+>>>>>>> .r38752
18271909 */
18281910 function getDatePreference() {
18291911 // Important migration for old data rows
——@@ -1840,7 +1922,7 @@
18411923
18421924 /**
18431925 * Get the permissions this user has.
1844 - * @return \arrayof{\string}
 1926+ * @return \arrayof{\string} Array of permission names
18451927 */
18461928 function getRights() {
18471929 if ( is_null( $this->mRights ) ) {
——@@ -1855,7 +1937,7 @@
18561938 /**
18571939 * Get the list of explicit group memberships this user has.
18581940 * The implicit * and user groups are not included.
1859 - * @return \arrayof{\string}
 1941+ * @return \arrayof{\string} Array of internal group names
18601942 */
18611943 function getGroups() {
18621944 $this->load();
——@@ -1866,8 +1948,13 @@
18671949 * Get the list of implicit group memberships this user has.
18681950 * This includes all explicit groups, plus 'user' if logged in,
18691951 * '*' for all accounts and autopromoted groups
 1952+<<<<<<< .mine
18701953 * @param $recache \type{\bool} Whether to avoid the cache
 1954+ * @return \arrayof{\string} Array of internal group names
 1955+=======
 1956+ * @param $recache \type{\bool} Whether to avoid the cache
18711957 * @return \arrayof{\string}
 1958+>>>>>>> .r38752
18721959 */
18731960 function getEffectiveGroups( $recache = false ) {
18741961 if ( $recache || is_null( $this->mEffectiveGroups ) ) {
——@@ -1890,7 +1977,11 @@
18911978
18921979 /**
18931980 * Get the user's edit count.
 1981+<<<<<<< .mine
 1982+ * @return \type{\int} User's edit count
 1983+=======
18941984 * @return \type{\int}
 1985+>>>>>>> .r38752
18951986 */
18961987 function getEditCount() {
18971988 if ($this->mId) {
——@@ -1954,7 +2045,11 @@
19552046
19562047 /**
19572048 * Get whether the user is logged in
 2049+<<<<<<< .mine
 2050+ * @return \type{\bool} True or false
 2051+=======
19582052 * @return \type{\bool}
 2053+>>>>>>> .r38752
19592054 */
19602055 function isLoggedIn() {
19612056 return $this->getID() != 0;
——@@ -1962,7 +2057,11 @@
19632058
19642059 /**
19652060 * Get whether the user is anonymous
 2061+<<<<<<< .mine
 2062+ * @return \type{\bool} True or false
 2063+=======
19662064 * @return \type{\bool}
 2065+>>>>>>> .r38752
19672066 */
19682067 function isAnon() {
19692068 return !$this->isLoggedIn();
——@@ -1970,7 +2069,11 @@
19712070
19722071 /**
19732072 * Get whether the user is a bot
 2073+<<<<<<< .mine
 2074+ * @return \type{\bool} True or false
 2075+=======
19742076 * @return \type{\bool}
 2077+>>>>>>> .r38752
19752078 * @deprecated
19762079 */
19772080 function isBot() {
——@@ -1993,7 +2096,11 @@
19942097
19952098 /**
19962099 * Check whether to enable recent changes patrol features for this user
 2100+<<<<<<< .mine
 2101+ * @return \type{\bool} True or false
 2102+=======
19972103 * @return \type{\bool}
 2104+>>>>>>> .r38752
19982105 */
19992106 public function useRCPatrol() {
20002107 global $wgUseRCPatrol;
——@@ -2002,7 +2109,11 @@
20032110
20042111 /**
20052112 * Check whether to enable new pages patrol features for this user
 2113+<<<<<<< .mine
 2114+ * @return \type{\bool} True or false
 2115+=======
20062116 * @return \type{\bool}
 2117+>>>>>>> .r38752
20072118 */
20082119 public function useNPPatrol() {
20092120 global $wgUseRCPatrol, $wgUseNPPatrol;
——@@ -2011,7 +2122,7 @@
20122123
20132124 /**
20142125 * Get the current skin, loading it if required
2015 - * @return \type{Skin}
 2126+ * @return \type{Skin} Current skin
20162127 * @todo FIXME : need to check the old failback system [AV]
20172128 */
20182129 function &getSkin() {
——@@ -2450,7 +2561,11 @@
24512562 * which will give them a chance to modify this key based on their own
24522563 * settings.
24532564 *
 2565+<<<<<<< .mine
 2566+ * @return \type{\string} Page rendering hash
 2567+=======
24542568 * @return \type{\string}
 2569+>>>>>>> .r38752
24552570 */
24562571 function getPageRenderingHash() {
24572572 global $wgContLang, $wgUseDynamicDates, $wgLang;
——@@ -2485,7 +2600,11 @@
24862601
24872602 /**
24882603 * Get whether the user is explicitly blocked from account creation.
 2604+<<<<<<< .mine
 2605+ * @return \type{\bool} True if blocked
 2606+=======
24892607 * @return \type{\bool}
 2608+>>>>>>> .r38752
24902609 */
24912610 function isBlockedFromCreateAccount() {
24922611 $this->getBlockedStatus();
——@@ -2494,7 +2613,11 @@
24952614
24962615 /**
24972616 * Get whether the user is blocked from using Special:Emailuser.
 2617+<<<<<<< .mine
 2618+ * @return \type{\bool} True if blocked
 2619+=======
24982620 * @return \type{\bool}
 2621+>>>>>>> .r38752
24992622 */
25002623 function isBlockedFromEmailuser() {
25012624 $this->getBlockedStatus();
——@@ -2503,7 +2626,11 @@
25042627
25052628 /**
25062629 * Get whether the user is allowed to create an account.
 2630+<<<<<<< .mine
 2631+ * @return \type{\bool} True if allowed
 2632+=======
25072633 * @return \type{\bool}
 2634+>>>>>>> .r38752
25082635 */
25092636 function isAllowedToCreateAccount() {
25102637 return $this->isAllowed( 'createaccount' ) && !$this->isBlockedFromCreateAccount();
——@@ -2519,7 +2646,7 @@
25202647 /**
25212648 * Get this user's personal page title.
25222649 *
2523 - * @return \type{Title}
 2650+ * @return \type{Title} User's personal page title
25242651 */
25252652 function getUserPage() {
25262653 return Title::makeTitle( NS_USER, $this->getName() );
——@@ -2528,7 +2655,7 @@
25292656 /**
25302657 * Get this user's talk page title.
25312658 *
2532 - * @return \type{Title}
 2659+ * @return \type{Title} User's talk page title
25332660 */
25342661 function getTalkPage() {
25352662 $title = $this->getUserPage();
——@@ -2537,7 +2664,11 @@
25382665
25392666 /**
25402667 * Get the maximum valid user ID.
 2668+<<<<<<< .mine
 2669+ * @return \type{\int} %User ID
 2670+=======
25412671 * @return \type{\int}
 2672+>>>>>>> .r38752
25422673 * @static
25432674 */
25442675 function getMaxID() {
——@@ -2629,7 +2760,11 @@
26302761 /**
26312762 * Check if the given clear-text password matches the temporary password
26322763 * sent by e-mail for password reset operations.
 2764+<<<<<<< .mine
 2765+ * @return \type{\bool} True if matches, false otherwise
 2766+=======
26332767 * @return \type{\bool}
 2768+>>>>>>> .r38752
26342769 */
26352770 function checkTemporaryPassword( $plaintext ) {
26362771 return self::comparePasswords( $this->mNewpassword, $plaintext, $this->getId() );
——@@ -2730,11 +2865,19 @@
27312866 * Send an e-mail to this user's account. Does not check for
27322867 * confirmed status or validity.
27332868 *
 2869+<<<<<<< .mine
27342870 * @param $subject \type{\string} Message subject
27352871 * @param $body \type{\string} Message body
27362872 * @param $from \type{\string} Optional From address; if unspecified, default $wgPasswordSender will be used
 2873+ * @param $replyto \type{\string} Reply-to address
 2874+ * @return \twotypes{\bool,WikiError} True on success, a WikiError object on failure
 2875+=======
 2876+ * @param $subject \type{\string} Message subject
 2877+ * @param $body \type{\string} Message body
 2878+ * @param $from \type{\string} Optional From address; if unspecified, default $wgPasswordSender will be used
27372879 * @param $replyto \type{\string}
27382880 * @return \twotypes{\bool,WikiError} True on success, a WikiError object on failure
 2881+>>>>>>> .r38752
27392882 */
27402883 function sendMail( $subject, $body, $from = null, $replyto = null ) {
27412884 if( is_null( $from ) ) {
——@@ -2754,8 +2897,13 @@
27552898 * @note Call saveSettings() after calling this function to commit
27562899 * this change to the database.
27572900 *
 2901+<<<<<<< .mine
27582902 * @param[out] &$expiration \type{\mixed} Accepts the expiration time
 2903+ * @return \type{\string} New token
 2904+=======
 2905+ * @param[out] &$expiration \type{\mixed} Accepts the expiration time
27592906 * @return \type{\string}
 2907+>>>>>>> .r38752
27602908 * @private
27612909 */
27622910 function confirmationToken( &$expiration ) {
——@@ -2772,8 +2920,13 @@
27732921
27742922 /**
27752923 * Return a URL the user can use to confirm their email address.
 2924+<<<<<<< .mine
27762925 * @param $token \type{\string} Accepts the email confirmation token
 2926+ * @return \type{\string} New token URL
 2927+=======
 2928+ * @param $token \type{\string} Accepts the email confirmation token
27772929 * @return \type{\string}
 2930+>>>>>>> .r38752
27782931 * @private
27792932 */
27802933 function confirmationTokenUrl( $token ) {
——@@ -2781,8 +2934,13 @@
27822935 }
27832936 /**
27842937 * Return a URL the user can use to invalidate their email address.
 2938+<<<<<<< .mine
27852939 * @param $token \type{\string} Accepts the email confirmation token
 2940+ * @return \type{\string} New token URL
 2941+=======
 2942+ * @param $token \type{\string} Accepts the email confirmation token
27862943 * @return \type{\string}
 2944+>>>>>>> .r38752
27872945 * @private
27882946 */
27892947 function invalidationTokenUrl( $token ) {
——@@ -2849,7 +3007,11 @@
28503008 /**
28513009 * Is this user allowed to send e-mails within limits of current
28523010 * site configuration?
 3011+<<<<<<< .mine
 3012+ * @return \type{\bool} True if allowed
 3013+=======
28533014 * @return \type{\bool}
 3015+>>>>>>> .r38752
28543016 */
28553017 function canSendEmail() {
28563018 $canSend = $this->isEmailConfirmed();
——@@ -2860,7 +3022,11 @@
28613023 /**
28623024 * Is this user allowed to receive e-mails within limits of current
28633025 * site configuration?
 3026+<<<<<<< .mine
 3027+ * @return \type{\bool} True if allowed
 3028+=======
28643029 * @return \type{\bool}
 3030+>>>>>>> .r38752
28653031 */
28663032 function canReceiveEmail() {
28673033 return $this->isEmailConfirmed() && !$this->getOption( 'disablemail' );
——@@ -2874,7 +3040,11 @@
28753041 * confirmed their address by returning a code or using a password
28763042 * sent to the address from the wiki.
28773043 *
 3044+<<<<<<< .mine
 3045+ * @return \type{\bool} True if conffirmed
 3046+=======
28783047 * @return \type{\bool}
 3048+>>>>>>> .r38752
28793049 */
28803050 function isEmailConfirmed() {
28813051 global $wgEmailAuthentication;
——@@ -2895,7 +3065,11 @@
28963066
28973067 /**
28983068 * Check whether there is an outstanding request for e-mail confirmation.
 3069+<<<<<<< .mine
 3070+ * @return \type{\bool} True if pending
 3071+=======
28993072 * @return \type{\bool}
 3073+>>>>>>> .r38752
29003074 */
29013075 function isEmailConfirmationPending() {
29023076 global $wgEmailAuthentication;
——@@ -2955,8 +3129,13 @@
29563130 /**
29573131 * Get the localized descriptive name for a group, if it exists
29583132 *
 3133+<<<<<<< .mine
29593134 * @param $group \type{\string} Internal group name
 3135+ * @return \type{\string} Localized descriptive group name
 3136+=======
 3137+ * @param $group \type{\string} Internal group name
29603138 * @return \type{\string}
 3139+>>>>>>> .r38752
29613140 */
29623141 static function getGroupName( $group ) {
29633142 global $wgMessageCache;
——@@ -2971,8 +3150,13 @@
29723151 /**
29733152 * Get the localized descriptive name for a member of a group, if it exists
29743153 *
 3154+<<<<<<< .mine
29753155 * @param $group \type{\string} Internal group name
 3156+ * @return \type{\string} Localized name for group member
 3157+=======
 3158+ * @param $group \type{\string} Internal group name
29763159 * @return \type{\string}
 3160+>>>>>>> .r38752
29773161 */
29783162 static function getGroupMember( $group ) {
29793163 global $wgMessageCache;
——@@ -2988,7 +3172,7 @@
29893173 * Return the set of defined explicit groups.
29903174 * The implicit groups (by default *, 'user' and 'autoconfirmed')
29913175 * are not included, as they are defined automatically, not in the database.
2992 - * @return \arrayof{\string}
 3176+ * @return \arrayof{\string} Array of internal group names
29933177 */
29943178 static function getAllGroups() {
29953179 global $wgGroupPermissions;
——@@ -3000,7 +3184,7 @@
30013185
30023186 /**
30033187 * Get a list of all available permissions.
3004 - * @return \arrayof{\string}
 3188+ * @return \arrayof{\string} Array of permission names
30053189 */
30063190 static function getAllRights() {
30073191 if ( self::$mAllRights === false ) {
——@@ -3017,7 +3201,7 @@
30183202
30193203 /**
30203204 * Get a list of implicit groups
3021 - * @return \arrayof{\string}
 3205+ * @return \arrayof{\string} Array of internal group names
30223206 */
30233207 public static function getImplicitGroups() {
30243208 global $wgImplicitGroups;
——@@ -3134,8 +3318,13 @@
31353319 /**
31363320 * Get the description of a given right
31373321 *
 3322+<<<<<<< .mine
31383323 * @param $right \type{\string} Right to query
 3324+ * @return \type{\string} Localized description of the right
 3325+=======
 3326+ * @param $right \type{\string} Right to query
31393327 * @return \type{\string}
 3328+>>>>>>> .r38752
31403329 */
31413330 static function getRightDescription( $right ) {
31423331 global $wgMessageCache;
——@@ -3188,10 +3377,17 @@
31893378 * Compare a password hash with a plain-text password. Requires the user
31903379 * ID if there's a chance that the hash is an old-style hash.
31913380 *
 3381+<<<<<<< .mine
31923382 * @param $hash \type{\string} Password hash
31933383 * @param $password \type{\string} Plain-text password to compare
31943384 * @param $userId \type{\string} %User ID for old-style password salt
 3385+ * @return \type{\bool} True if matches, false otherwise
 3386+=======
 3387+ * @param $hash \type{\string} Password hash
 3388+ * @param $password \type{\string} Plain-text password to compare
 3389+ * @param $userId \type{\string} %User ID for old-style password salt
31953390 * @return \type{\bool}
 3391+>>>>>>> .r38752
31963392 */
31973393 static function comparePasswords( $hash, $password, $userId = false ) {
31983394 $m = false;

Follow-up revisions

RevisionCommit summaryAuthorDate
r38758Revert r38753 - crap diff...raymond09:34, 7 August 2008
r38764Non-crap version of r38753 - sorry about that ._.krimpet10:43, 7 August 2008

Status & tagging log