| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -47,7 +47,7 @@ |
| 48 | 48 | * Fields can be retrieved with $row->fieldname, with fields acting like |
| 49 | 49 | * member variables. |
| 50 | 50 | * |
| 51 | | - * @param $res SQL result object as returned from DatabaseBase::query(), etc. |
| | 51 | + * @param $res ResultWrapper|object as returned from DatabaseBase::query(), etc. |
| 52 | 52 | * @return Row object |
| 53 | 53 | * @throws DBUnexpectedError Thrown if the database returns an error |
| 54 | 54 | */ |
| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.i18n.php |
| — | — | @@ -30,6 +30,8 @@ |
| 31 | 31 | 'globalblocking-block-expiry-otherfield' => 'Other time:', |
| 32 | 32 | 'globalblocking-block-legend' => 'Block an IP address globally', |
| 33 | 33 | 'globalblocking-block-options' => 'Options:', |
| | 34 | + 'globalblocking-ipaddress' => 'IP address:', |
| | 35 | + 'globalblocking-ipbanononly' => 'Block anonymous users only', |
| 34 | 36 | 'globalblocking-block-errors' => "Your block was unsuccessful, for the following {{PLURAL:$1|reason|reasons}}:", |
| 35 | 37 | 'globalblocking-block-ipinvalid' => 'The IP address ($1) you entered is invalid. |
| 36 | 38 | Please note that you cannot enter a user name!', |
| Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php |
| — | — | @@ -181,7 +181,7 @@ |
| 182 | 182 | $fields = array(); |
| 183 | 183 | |
| 184 | 184 | // Who to block |
| 185 | | - $fields['ipaddress'] = |
| | 185 | + $fields['globalblocking-ipaddress'] = |
| 186 | 186 | Xml::input( 'wpAddress', |
| 187 | 187 | 45, |
| 188 | 188 | $this->mAddress, |
| — | — | @@ -246,7 +246,7 @@ |
| 247 | 247 | // Block all users, or just anonymous ones |
| 248 | 248 | $fields['globalblocking-block-options'] = |
| 249 | 249 | Xml::checkLabel( |
| 250 | | - wfMsg( 'ipbanononly' ), |
| | 250 | + wfMsg( 'globalblocking-ipbanononly' ), |
| 251 | 251 | 'wpAnonOnly', |
| 252 | 252 | 'mw-globalblock-anon-only', |
| 253 | 253 | $this->mAnonOnly |