| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2226,8 +2226,10 @@ |
| 2227 | 2227 | } else { |
| 2228 | 2228 | $suppress = ''; |
| 2229 | 2229 | } |
| | 2230 | + $checkWatch = $wgUser->getBoolOption( 'watchdeletion' ) || $this->mTitle->userIsWatching(); |
| 2230 | 2231 | |
| 2231 | | - $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->mTitle->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ) ) . |
| | 2232 | + $form = Xml::openElement( 'form', array( 'method' => 'post', |
| | 2233 | + 'action' => $this->mTitle->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ) ) . |
| 2232 | 2234 | Xml::openElement( 'fieldset', array( 'id' => 'mw-delete-table' ) ) . |
| 2233 | 2235 | Xml::tags( 'legend', null, wfMsgExt( 'delete-legend', array( 'parsemag', 'escapenoentities' ) ) ) . |
| 2234 | 2236 | Xml::openElement( 'table' ) . |
| — | — | @@ -2246,13 +2248,14 @@ |
| 2247 | 2249 | Xml::label( wfMsg( 'deleteotherreason' ), 'wpReason' ) . |
| 2248 | 2250 | "</td> |
| 2249 | 2251 | <td>" . |
| 2250 | | - Xml::input( 'wpReason', 60, $reason, array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ) ) . |
| | 2252 | + Xml::input( 'wpReason', 60, $reason, array( 'type' => 'text', 'maxlength' => '255', |
| | 2253 | + 'tabindex' => '2', 'id' => 'wpReason' ) ) . |
| 2251 | 2254 | "</td> |
| 2252 | 2255 | </tr> |
| 2253 | 2256 | <tr> |
| 2254 | 2257 | <td></td> |
| 2255 | 2258 | <td>" . |
| 2256 | | - Xml::checkLabel( wfMsg( 'watchthis' ), 'wpWatch', 'wpWatch', $wgUser->getBoolOption( 'watchdeletion' ) || $this->mTitle->userIsWatching(), array( 'tabindex' => '3' ) ) . |
| | 2259 | + Xml::checkLabel( wfMsg( 'watchthis' ), 'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) . |
| 2257 | 2260 | "</td> |
| 2258 | 2261 | </tr> |
| 2259 | 2262 | $suppress |