| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | |
| 27 | 27 | function __construct( $address = '', $user = 0, $by = 0, $reason = '', |
| 28 | 28 | $timestamp = '' , $auto = 0, $expiry = '', $anonOnly = 0, $createAccount = 0, $enableAutoblock = 0, |
| 29 | | - $hideName = 0, $blockEmail = 0, $allowUsertalk = 0 ) |
| | 29 | + $hideName = 0, $blockEmail = 0, $allowUsertalk = 0, $byName = false ) |
| 30 | 30 | { |
| 31 | 31 | $this->mId = 0; |
| 32 | 32 | # Expand valid IPv6 addresses |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | $this->mAllowUsertalk = $allowUsertalk; |
| 47 | 47 | $this->mForUpdate = false; |
| 48 | 48 | $this->mFromMaster = false; |
| 49 | | - $this->mByName = false; |
| | 49 | + $this->mByName = $byName; |
| 50 | 50 | $this->mAngryAutoblock = false; |
| 51 | 51 | $this->initialiseRange(); |
| 52 | 52 | } |
| Index: trunk/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -1092,7 +1092,6 @@ |
| 1093 | 1093 | /* $address */ $this->mName, |
| 1094 | 1094 | /* $user */ $data['id'], |
| 1095 | 1095 | /* $by */ 0, |
| 1096 | | - //'ipb_by_text' => $by, |
| 1097 | 1096 | /* $reason */ $blockReason, |
| 1098 | 1097 | /* $timestamp */ wfTimestampNow(), |
| 1099 | 1098 | /* $auto */ false, |
| — | — | @@ -1102,7 +1101,8 @@ |
| 1103 | 1102 | /* $enableAutoblock */ true, |
| 1104 | 1103 | /* $hideName (ipb_deleted) */ true, |
| 1105 | 1104 | /* $blockEmail */ true, |
| 1106 | | - /* $allowUsertalk */ false |
| | 1105 | + /* $allowUsertalk */ false, |
| | 1106 | + /* $byName */ $by |
| 1107 | 1107 | ); |
| 1108 | 1108 | |
| 1109 | 1109 | # On normal block, BlockIp hook would be run here, but doing |