| Index: trunk/phase3/includes/specials/SpecialBlockip.php |
| — | — | @@ -106,6 +106,15 @@ |
| 107 | 107 | ( $currentBlock->mAddress == $this->BlockAddress ) ) ) { |
| 108 | 108 | $wgOut->addWikiMsg( 'ipb-needreblock', $this->BlockAddress ); |
| 109 | 109 | $alreadyBlocked = true; |
| | 110 | + # Set the block form settings to the existing block |
| | 111 | + $this->BlockAnonOnly = $currentBlock->mAnonOnly; |
| | 112 | + $this->BlockCreateAccount = $currentBlock->mCreateAccount; |
| | 113 | + $this->BlockEnableAutoblock = $currentBlock->mEnableAutoblock; |
| | 114 | + $this->BlockEmail = $currentBlock->mBlockEmail; |
| | 115 | + $this->BlockHideName = $currentBlock->mHideName; |
| | 116 | + $this->BlockAllowUsertalk = $currentBlock->mAllowUsertalk; |
| | 117 | + $this->BlockOther = wfTimestamp( TS_RFC2822, $currentBlock->mExpiry ); |
| | 118 | + $this->BlockReason = $currentBlock->mReason; |
| 110 | 119 | } |
| 111 | 120 | } |
| 112 | 121 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -39,6 +39,8 @@ |
| 40 | 40 | of Service page, for example |
| 41 | 41 | * Add new hook 'UserLoadFromDatabase' that is called while loading a user |
| 42 | 42 | from the database. |
| | 43 | +* (bug 17045) Options on the block form are prefilled with the options of the |
| | 44 | + existing block when modifying an existing block. |
| 43 | 45 | |
| 44 | 46 | === Bug fixes in 1.15 === |
| 45 | 47 | * (bug 16968) Special:Upload no longer throws useless warnings. |