dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re add wpScrolltop id in EditPage
[lhc/web/wiklou.git]
/
includes
/
EditPage.php
diff --git
a/includes/EditPage.php
b/includes/EditPage.php
index
0e1438f
..
2860664
100644
(file)
--- a/
includes/EditPage.php
+++ b/
includes/EditPage.php
@@
-2658,8
+2658,7
@@
class EditPage {
$wgOut->addHTML( Html::openElement(
'form',
[
$wgOut->addHTML( Html::openElement(
'form',
[
- // Keep mw-editform-ooui class for backwards-compatibility temporarily
- 'class' => 'mw-editform mw-editform-ooui',
+ 'class' => 'mw-editform',
'id' => self::EDITFORM_ID,
'name' => self::EDITFORM_ID,
'method' => 'post',
'id' => self::EDITFORM_ID,
'name' => self::EDITFORM_ID,
'method' => 'post',
@@
-2702,7
+2701,7
@@
class EditPage {
if ( $this->wasDeletedSinceLastEdit() && 'save' == $this->formtype ) {
$username = $this->lastDelete->user_name;
if ( $this->wasDeletedSinceLastEdit() && 'save' == $this->formtype ) {
$username = $this->lastDelete->user_name;
- $comment =
$this->lastDelete->log_commen
t;
+ $comment =
CommentStore::newKey( 'log_comment' )->getComment( $this->lastDelete )->tex
t;
// It is better to not parse the comment at all than to have templates expanded in the middle
// TODO: can the checkLabel be moved outside of the div so that wrapWikiMsg could be used?
// It is better to not parse the comment at all than to have templates expanded in the middle
// TODO: can the checkLabel be moved outside of the div so that wrapWikiMsg could be used?
@@
-3166,7
+3165,7
@@
class EditPage {
$wgOut->addHTML( Html::hidden( 'wpStarttime', $this->starttime ) );
$wgOut->addHTML( Html::hidden( 'wpEdittime', $this->edittime ) );
$wgOut->addHTML( Html::hidden( 'editRevId', $this->editRevId ) );
$wgOut->addHTML( Html::hidden( 'wpStarttime', $this->starttime ) );
$wgOut->addHTML( Html::hidden( 'wpEdittime', $this->edittime ) );
$wgOut->addHTML( Html::hidden( 'editRevId', $this->editRevId ) );
- $wgOut->addHTML( Html::hidden( 'wpScrolltop', $this->scrolltop ) );
+ $wgOut->addHTML( Html::hidden( 'wpScrolltop', $this->scrolltop
, [ 'id' => 'wpScrolltop' ]
) );
if ( !$this->checkUnicodeCompliantBrowser() ) {
$wgOut->addHTML( Html::hidden( 'safemode', '1' ) );
if ( !$this->checkUnicodeCompliantBrowser() ) {
$wgOut->addHTML( Html::hidden( 'safemode', '1' ) );
@@
-3688,8
+3687,9
@@
class EditPage {
*/
protected function getLastDelete() {
$dbr = wfGetDB( DB_REPLICA );
*/
protected function getLastDelete() {
$dbr = wfGetDB( DB_REPLICA );
+ $commentQuery = CommentStore::newKey( 'log_comment' )->getJoin();
$data = $dbr->selectRow(
$data = $dbr->selectRow(
- [ 'logging', 'user' ],
+ [ 'logging', 'user' ]
+ $commentQuery['tables']
,
[
'log_type',
'log_action',
[
'log_type',
'log_action',
@@
-3697,11
+3697,10
@@
class EditPage {
'log_user',
'log_namespace',
'log_title',
'log_user',
'log_namespace',
'log_title',
- 'log_comment',
'log_params',
'log_deleted',
'user_name'
'log_params',
'log_deleted',
'user_name'
- ], [
+ ]
+ $commentQuery['fields']
, [
'log_namespace' => $this->mTitle->getNamespace(),
'log_title' => $this->mTitle->getDBkey(),
'log_type' => 'delete',
'log_namespace' => $this->mTitle->getNamespace(),
'log_title' => $this->mTitle->getDBkey(),
'log_type' => 'delete',
@@
-3709,7
+3708,10
@@
class EditPage {
'user_id=log_user'
],
__METHOD__,
'user_id=log_user'
],
__METHOD__,
- [ 'LIMIT' => 1, 'ORDER BY' => 'log_timestamp DESC' ]
+ [ 'LIMIT' => 1, 'ORDER BY' => 'log_timestamp DESC' ],
+ [
+ 'user' => [ 'JOIN', 'user_id=log_user' ],
+ ] + $commentQuery['joins']
);
// Quick paranoid permission checks...
if ( is_object( $data ) ) {
);
// Quick paranoid permission checks...
if ( is_object( $data ) ) {
@@
-3718,7
+3720,8
@@
class EditPage {
}
if ( $data->log_deleted & LogPage::DELETED_COMMENT ) {
}
if ( $data->log_deleted & LogPage::DELETED_COMMENT ) {
- $data->log_comment = $this->context->msg( 'rev-deleted-comment' )->escaped();
+ $data->log_comment_text = $this->context->msg( 'rev-deleted-comment' )->escaped();
+ $data->log_comment_data = null;
}
}
}
}
@@
-4083,7
+4086,7
@@
class EditPage {
* where bool indicates the checked status of the checkbox
* @return array
*/
* where bool indicates the checked status of the checkbox
* @return array
*/
- p
rotected
function getCheckboxesDefinition( $checked ) {
+ p
ublic
function getCheckboxesDefinition( $checked ) {
global $wgUser;
$checkboxes = [];
global $wgUser;
$checkboxes = [];