| Index: trunk/phase3/includes/User.php |
| — | — | @@ -115,7 +115,6 @@ |
| 116 | 116 | 'deletedhistory', |
| 117 | 117 | 'deletedtext', |
| 118 | 118 | 'deleterevision', |
| 119 | | - 'disableaccount', |
| 120 | 119 | 'edit', |
| 121 | 120 | 'editinterface', |
| 122 | 121 | 'editusercssjs', #deprecated |
| — | — | @@ -2143,7 +2142,7 @@ |
| 2144 | 2143 | global $wgRealNameInInterface; |
| 2145 | 2144 | if ( is_null( $this->mDisplayName ) ) { |
| 2146 | 2145 | $displayName = null; |
| 2147 | | - |
| | 2146 | + |
| 2148 | 2147 | // Allow hooks to set a display name |
| 2149 | 2148 | wfRunHooks( 'UserDisplayName', array( $this, &$displayName ) ); |
| 2150 | 2149 | |
| — | — | @@ -2151,7 +2150,7 @@ |
| 2152 | 2151 | // If $wgRealNameInInterface is true use the real name as the display name if it's set |
| 2153 | 2152 | $displayName = $this->getRealName(); |
| 2154 | 2153 | } |
| 2155 | | - |
| | 2154 | + |
| 2156 | 2155 | if ( is_null( $displayName ) ) { |
| 2157 | 2156 | $displayName = $this->getName(); |
| 2158 | 2157 | } |
| — | — | @@ -3192,8 +3191,8 @@ |
| 3193 | 3192 | |
| 3194 | 3193 | /** |
| 3195 | 3194 | * Alias for getEditToken. |
| 3196 | | - * @deprecated since 1.19, use getEditToken instead. |
| 3197 | | - * |
| | 3195 | + * @deprecated since 1.19, use getEditToken instead. |
| | 3196 | + * |
| 3198 | 3197 | * @param $salt String|Array of Strings Optional function-specific data for hashing |
| 3199 | 3198 | * @param $request WebRequest object to use or null to use $wgRequest |
| 3200 | 3199 | * @return String The new edit token |
| — | — | @@ -3201,7 +3200,7 @@ |
| 3202 | 3201 | public function editToken( $salt = '', $request = null ) { |
| 3203 | 3202 | return $this->getEditToken( $salt, $request ); |
| 3204 | 3203 | } |
| 3205 | | - |
| | 3204 | + |
| 3206 | 3205 | /** |
| 3207 | 3206 | * Initialize (if necessary) and return a session token value |
| 3208 | 3207 | * which can be used in edit forms to show that the user's |