| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -193,7 +193,7 @@ |
| 194 | 194 | for "ABORTED" reason to be returned and displayed to user. |
| 195 | 195 | * (bug 28034) uploading file to local wiki when file exists on shared repository |
| 196 | 196 | (commons) gives spurious info in the warning message |
| 197 | | - |
| | 197 | + |
| 198 | 198 | === API changes in 1.18 === |
| 199 | 199 | * (bug 26339) Throw warning when truncating an overlarge API result |
| 200 | 200 | * (bug 14869) Add API module for accessing QueryPage-based special pages |
| Index: trunk/extensions/TitleBlacklist/TitleBlacklist.list.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * Load all configured blacklist sources |
| 25 | | - */ |
| | 25 | + */ |
| 26 | 26 | public function load() { |
| 27 | 27 | global $wgTitleBlacklistSources, $wgMemc, $wgTitleBlacklistCaching; |
| 28 | 28 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -46,7 +46,7 @@ |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | 49 | * Load all configured whitelist sources |
| 50 | | - */ |
| | 50 | + */ |
| 51 | 51 | public function loadWhitelist() { |
| 52 | 52 | global $wgMemc, $wgTitleBlacklistCaching; |
| 53 | 53 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | * |
| 68 | 68 | * @param $source A blacklist source from $wgTitleBlacklistSources |
| 69 | 69 | * @return The content of the blacklist source as a string |
| 70 | | - */ |
| | 70 | + */ |
| 71 | 71 | private static function getBlacklistText( $source ) { |
| 72 | 72 | if( !is_array( $source ) || count( $source ) <= 0 ) { |
| 73 | 73 | return ''; //Return empty string in error case |
| — | — | @@ -111,7 +111,7 @@ |
| 112 | 112 | * |
| 113 | 113 | * @param $list Text of a blacklist source, as a string |
| 114 | 114 | * @return An array of TitleBlacklistEntry entries |
| 115 | | - */ |
| | 115 | + */ |
| 116 | 116 | public static function parseBlacklist( $list ) { |
| 117 | 117 | wfProfileIn( __METHOD__ ); |
| 118 | 118 | $lines = preg_split( "/\r?\n/", $list ); |
| — | — | @@ -138,7 +138,7 @@ |
| 139 | 139 | * @param $override If set to true, overrides work |
| 140 | 140 | * @return The corresponding TitleBlacklistEntry if blacklisted; |
| 141 | 141 | * otherwise FALSE |
| 142 | | - */ |
| | 142 | + */ |
| 143 | 143 | public function userCannot( $title, $user, $action = 'edit', $override = true ) { |
| 144 | 144 | if( $override && self::userCanOverride( $action ) ) |
| 145 | 145 | return false; |
| — | — | @@ -154,7 +154,7 @@ |
| 155 | 155 | * @param $action Action to check; 'edit' if unspecified |
| 156 | 156 | * @return The corresponding TitleBlacklistEntry if blacklisted; |
| 157 | 157 | * otherwise FALSE |
| 158 | | - */ |
| | 158 | + */ |
| 159 | 159 | public function isBlacklisted( $title, $action = 'edit' ) { |
| 160 | 160 | if( !($title instanceof Title) ) { |
| 161 | 161 | $title = Title::newFromText( $title ); |
| — | — | @@ -178,7 +178,7 @@ |
| 179 | 179 | * @param $title Title to check |
| 180 | 180 | * @param $action Action to check; 'edit' if unspecified |
| 181 | 181 | * @return TRUE if whitelisted; otherwise FALSE |
| 182 | | - */ |
| | 182 | + */ |
| 183 | 183 | public function isWhitelisted( $title, $action = 'edit' ) { |
| 184 | 184 | global $wgUser; |
| 185 | 185 | if( !($title instanceof Title) ) { |
| — | — | @@ -197,7 +197,7 @@ |
| 198 | 198 | * Get the current blacklist |
| 199 | 199 | * |
| 200 | 200 | * @return Array of TitleBlacklistEntry items |
| 201 | | - */ |
| | 201 | + */ |
| 202 | 202 | public function getBlacklist() { |
| 203 | 203 | if( is_null( $this->mBlacklist ) ) { |
| 204 | 204 | $this->load(); |
| — | — | @@ -209,7 +209,7 @@ |
| 210 | 210 | * Get the current whitelist |
| 211 | 211 | * |
| 212 | 212 | * @return Array of TitleBlacklistEntry items |
| 213 | | - */ |
| | 213 | + */ |
| 214 | 214 | public function getWhitelist() { |
| 215 | 215 | if( is_null( $this->mWhitelist ) ) { |
| 216 | 216 | $this->loadWhitelist(); |
| — | — | @@ -222,7 +222,7 @@ |
| 223 | 223 | * |
| 224 | 224 | * @param $source URL of the blacklist source |
| 225 | 225 | * @return The content of the blacklist source as a string |
| 226 | | - */ |
| | 226 | + */ |
| 227 | 227 | private static function getHttp( $url ) { |
| 228 | 228 | global $messageMemc, $wgTitleBlacklistCaching; |
| 229 | 229 | $key = "title_blacklist_source:" . md5( $url ); // Global shared |