| Index: trunk/phase3/includes/specials/SpecialMergeHistory.php |
| — | — | @@ -165,19 +165,15 @@ |
| 166 | 166 | # in a nice little table |
| 167 | 167 | $table = |
| 168 | 168 | Xml::openElement( 'fieldset' ) . |
| | 169 | + wfMsgExt( 'mergehistory-merge', array('parseinline'), |
| | 170 | + $this->mTargetObj->getPrefixedText(), $this->mDestObj->getPrefixedText() ) . |
| 169 | 171 | Xml::openElement( 'table', array( 'id' => 'mw-mergehistory-table' ) ) . |
| 170 | 172 | "<tr> |
| 171 | 173 | <td class='mw-label'>" . |
| 172 | | - wfMsgExt( 'mergehistory-merge', array('parseinline'), |
| 173 | | - $this->mTargetObj->getPrefixedText(), $this->mDestObj->getPrefixedText() ) . |
| | 174 | + Xml::label( wfMsg( 'mergehistory-reason' ), 'wpComment' ) . |
| 174 | 175 | "</td> |
| 175 | | - </tr> |
| 176 | | - <tr> |
| 177 | | - <td class='mw-label'>" . |
| 178 | | - Xml::label( wfMsg( 'undeletecomment' ), 'wpComment' ) . |
| 179 | | - "</td> |
| 180 | 176 | <td class='mw-input'>" . |
| 181 | | - Xml::input( 'wpComment', 50, $this->mComment ) . |
| | 177 | + Xml::input( 'wpComment', 50, $this->mComment, array('id' => 'wpComment') ) . |
| 182 | 178 | "</td> |
| 183 | 179 | </tr> |
| 184 | 180 | <tr> |
| — | — | @@ -438,7 +434,7 @@ |
| 439 | 435 | return array( |
| 440 | 436 | 'tables' => array('revision','page'), |
| 441 | 437 | 'fields' => array( 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text', 'rev_comment', |
| 442 | | - 'rev_id', 'rev_page', 'rev_text_id', 'rev_len', 'rev_deleted' ), |
| | 438 | + 'rev_id', 'rev_page', 'rev_parent_id', 'rev_text_id', 'rev_len', 'rev_deleted' ), |
| 443 | 439 | 'conds' => $conds |
| 444 | 440 | ); |
| 445 | 441 | } |