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
Remove cols and rows preferences
[lhc/web/wiklou.git]
/
includes
/
EditPage.php
diff --git
a/includes/EditPage.php
b/includes/EditPage.php
index
4f1e47d
..
05fa366
100644
(file)
--- a/
includes/EditPage.php
+++ b/
includes/EditPage.php
@@
-2146,7
+2146,8
@@
class EditPage {
false,
$wgUser,
$content->getDefaultFormat(),
false,
$wgUser,
$content->getDefaultFormat(),
- $this->changeTags
+ $this->changeTags,
+ $this->undidRev
);
if ( !$doEditStatus->isOK() ) {
);
if ( !$doEditStatus->isOK() ) {
@@
-2601,7
+2602,9
@@
class EditPage {
$previewOutput = $this->getPreviewText();
}
$previewOutput = $this->getPreviewText();
}
- Hooks::run( 'EditPage::showEditForm:initial', [ &$this, &$wgOut ] );
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $editPage = $this;
+ Hooks::run( 'EditPage::showEditForm:initial', [ &$editPage, &$wgOut ] );
$this->setHeaders();
$this->setHeaders();
@@
-2678,7
+2681,9
@@
class EditPage {
. Xml::closeElement( 'div' )
);
. Xml::closeElement( 'div' )
);
- Hooks::run( 'EditPage::showEditForm:fields', [ &$this, &$wgOut ] );
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $editPage = $this;
+ Hooks::run( 'EditPage::showEditForm:fields', [ &$editPage, &$wgOut ] );
// Put these up at the top to ensure they aren't lost on early form submission
$this->showFormBeforeText();
// Put these up at the top to ensure they aren't lost on early form submission
$this->showFormBeforeText();
@@
-2838,7
+2843,7
@@
class EditPage {
* @param Title[] $templates
* @return string HTML
*/
* @param Title[] $templates
* @return string HTML
*/
- p
rotected
function makeTemplatesOnThisPageList( array $templates ) {
+ p
ublic
function makeTemplatesOnThisPageList( array $templates ) {
$templateListFormatter = new TemplatesOnThisPageFormatter(
$this->context, MediaWikiServices::getInstance()->getLinkRenderer()
);
$templateListFormatter = new TemplatesOnThisPageFormatter(
$this->context, MediaWikiServices::getInstance()->getLinkRenderer()
);
@@
-3540,7
+3545,9
@@
HTML
protected function showConflict() {
global $wgOut;
protected function showConflict() {
global $wgOut;
- if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$this, &$wgOut ] ) ) {
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $editPage = $this;
+ if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$editPage, &$wgOut ] ) ) {
$stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
$stats->increment( 'edit.failures.conflict' );
// Only include 'standard' namespaces to avoid creating unknown numbers of statsd metrics
$stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
$stats->increment( 'edit.failures.conflict' );
// Only include 'standard' namespaces to avoid creating unknown numbers of statsd metrics
@@
-4068,7
+4075,10
@@
HTML
$checkboxes['watch'] = $watchThisHtml;
}
}
$checkboxes['watch'] = $watchThisHtml;
}
}
- Hooks::run( 'EditPageBeforeEditChecks', [ &$this, &$checkboxes, &$tabindex ] );
+
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $editPage = $this;
+ Hooks::run( 'EditPageBeforeEditChecks', [ &$editPage, &$checkboxes, &$tabindex ] );
return $checkboxes;
}
return $checkboxes;
}
@@
-4117,7
+4127,9
@@
HTML
$buttons['diff'] = Html::submitButton( $this->context->msg( 'showdiff' )->text(),
$attribs );
$buttons['diff'] = Html::submitButton( $this->context->msg( 'showdiff' )->text(),
$attribs );
- Hooks::run( 'EditPageBeforeEditButtons', [ &$this, &$buttons, &$tabindex ] );
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $editPage = $this;
+ Hooks::run( 'EditPageBeforeEditButtons', [ &$editPage, &$buttons, &$tabindex ] );
return $buttons;
}
return $buttons;
}
@@
-4131,7
+4143,10
@@
HTML
$wgOut->prepareErrorPage( $this->context->msg( 'nosuchsectiontitle' ) );
$res = $this->context->msg( 'nosuchsectiontext', $this->section )->parseAsBlock();
$wgOut->prepareErrorPage( $this->context->msg( 'nosuchsectiontitle' ) );
$res = $this->context->msg( 'nosuchsectiontext', $this->section )->parseAsBlock();
- Hooks::run( 'EditPageNoSuchSection', [ &$this, &$res ] );
+
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $editPage = $this;
+ Hooks::run( 'EditPageNoSuchSection', [ &$editPage, &$res ] );
$wgOut->addHTML( $res );
$wgOut->returnToMain( false, $this->mTitle );
$wgOut->addHTML( $res );
$wgOut->returnToMain( false, $this->mTitle );
@@
-4426,8
+4441,8
@@
HTML
$attribs = $customAttribs + [
'accesskey' => ',',
'id' => $name,
$attribs = $customAttribs + [
'accesskey' => ',',
'id' => $name,
- 'cols' =>
$user->getIntOption( 'cols' )
,
- 'rows' =>
$user->getIntOption( 'rows' )
,
+ 'cols' =>
80
,
+ 'rows' =>
25
,
// Avoid PHP notices when appending preferences
// (appending allows customAttribs['style'] to still work).
'style' => ''
// Avoid PHP notices when appending preferences
// (appending allows customAttribs['style'] to still work).
'style' => ''