private $mContextTitle = null;
/** @var string */
- protected $action = 'submit';
+ public $action = 'submit';
/** @var bool */
public $isConflict = false;
public $isJsSubpage = false;
/** @var bool */
- protected $isWrongCaseCssJsPage = false;
+ public $isWrongCaseCssJsPage = false;
/** @var bool New page or new section */
- protected $isNew = false;
+ public $isNew = false;
/** @var bool */
- protected $deletedSinceEdit;
+ public $deletedSinceEdit;
/** @var string */
public $formtype;
public $firsttime;
/** @var bool|stdClass */
- protected $lastDelete;
+ public $lastDelete;
- /** @var bool
- * This is public because SemanticForms uses it (bug 67522).
- * However, please consider using this property publicly
- * to be deprecated.
- * @protected
- */
+ /** @var bool */
public $mTokenOk = false;
/** @var bool */
- protected $mTokenOkExceptSuffix = false;
+ public $mTokenOkExceptSuffix = false;
/** @var bool */
- protected $mTriedSave = false;
+ public $mTriedSave = false;
/** @var bool */
- protected $incompleteForm = false;
+ public $incompleteForm = false;
/** @var bool */
- protected $tooBig = false;
+ public $tooBig = false;
/** @var bool */
- protected $kblength = false;
+ public $kblength = false;
/** @var bool */
- protected $missingComment = false;
+ public $missingComment = false;
/** @var bool */
- protected $missingSummary = false;
+ public $missingSummary = false;
/** @var bool */
- protected $allowBlankSummary = false;
+ public $allowBlankSummary = false;
/** @var bool */
protected $blankArticle = false;
protected $allowBlankArticle = false;
/** @var string */
- protected $autoSumm = '';
+ public $autoSumm = '';
/** @var string */
public $hookError = '';
/** @var ParserOutput */
- protected $mParserOutput;
+ public $mParserOutput;
/** @var bool Has a summary been preset using GET parameter &summary= ? */
- protected $hasPresetSummary = false;
+ public $hasPresetSummary = false;
/** @var bool */
- protected $mBaseRevision = false;
+ public $mBaseRevision = false;
/** @var bool */
public $mShowSummaryField = true;
public $preview = false;
/** @var bool */
- protected $diff = false;
+ public $diff = false;
/** @var bool */
public $minoredit = false;
/** @var bool */
- protected $watchthis = false;
+ public $watchthis = false;
/** @var bool */
- protected $recreate = false;
+ public $recreate = false;
/** @var string */
public $textbox1 = '';
public $summary = '';
/** @var bool */
- protected $nosummary = false;
+ public $nosummary = false;
/** @var string */
public $edittime = '';
public $sectiontitle = '';
/** @var string */
- protected $starttime = '';
+ public $starttime = '';
/** @var int */
public $oldid = 0;
/** @var string */
- protected $editintro = '';
+ public $editintro = '';
/** @var null */
public $scrolltop = null;
( ( $this->minoredit && !$this->isNew ) ? EDIT_MINOR : 0 ) |
( $bot ? EDIT_FORCE_BOT : 0 );
- $doEditStatus = $this->mArticle->doEditContent( $content, $this->summary, $flags,
- false, null, $this->contentFormat );
+ $doEditStatus = $this->mArticle->doEditContent(
+ $content,
+ $this->summary,
+ $flags,
+ false,
+ null,
+ $content->getDefaultFormat()
+ );
if ( !$doEditStatus->isOK() ) {
// Failure from doEdit()
// Do this in its own transaction to reduce contention...
$dbw = wfGetDB( DB_MASTER );
$dbw->onTransactionIdle( function () use ( $dbw, $title, $watch, $wgUser, $fname ) {
- $dbw->begin( $fname );
WatchAction::doWatchOrUnwatch( $watch, $title, $wgUser );
- $dbw->commit( $fname );
} );
}
}
$attrs['class'] = 'mw-ui-button mw-ui-quiet';
}
$edithelp = Html::element( 'a', $attrs, wfMessage( 'edithelp' )->text() ) .
+ wfMessage( 'word-separator' )->escaped() .
wfMessage( 'newwindow' )->parse();
$wgOut->addHTML( " <span class='cancelLink'>{$cancel}</span>\n" );
* @return string
*/
static function getEditToolbar() {
- global $wgStylePath, $wgContLang, $wgLang, $wgOut;
+ global $wgContLang, $wgOut;
global $wgEnableUploads, $wgForeignFileRepos;
$imagesAvailable = $wgEnableUploads || count( $wgForeignFileRepos );
/**
* $toolarray is an array of arrays each of which includes the
- * filename of the button image (without path), the opening
- * tag, the closing tag, optionally a sample text that is
+ * opening tag, the closing tag, optionally a sample text that is
* inserted between the two when no selection is highlighted
* and. The tip text is shown when the user moves the mouse
* over the button.
+ *
+ * Images are defined in ResourceLoaderEditToolbarModule.
*/
$toolarray = array(
array(
- 'image' => $wgLang->getImageFile( 'button-bold' ),
'id' => 'mw-editbutton-bold',
'open' => '\'\'\'',
'close' => '\'\'\'',
'tip' => wfMessage( 'bold_tip' )->text(),
),
array(
- 'image' => $wgLang->getImageFile( 'button-italic' ),
'id' => 'mw-editbutton-italic',
'open' => '\'\'',
'close' => '\'\'',
'tip' => wfMessage( 'italic_tip' )->text(),
),
array(
- 'image' => $wgLang->getImageFile( 'button-link' ),
'id' => 'mw-editbutton-link',
'open' => '[[',
'close' => ']]',
'tip' => wfMessage( 'link_tip' )->text(),
),
array(
- 'image' => $wgLang->getImageFile( 'button-extlink' ),
'id' => 'mw-editbutton-extlink',
'open' => '[',
'close' => ']',
'tip' => wfMessage( 'extlink_tip' )->text(),
),
array(
- 'image' => $wgLang->getImageFile( 'button-headline' ),
'id' => 'mw-editbutton-headline',
'open' => "\n== ",
'close' => " ==\n",
'tip' => wfMessage( 'headline_tip' )->text(),
),
$imagesAvailable ? array(
- 'image' => $wgLang->getImageFile( 'button-image' ),
'id' => 'mw-editbutton-image',
'open' => '[[' . $wgContLang->getNsText( NS_FILE ) . ':',
'close' => ']]',
'tip' => wfMessage( 'image_tip' )->text(),
) : false,
$imagesAvailable ? array(
- 'image' => $wgLang->getImageFile( 'button-media' ),
'id' => 'mw-editbutton-media',
'open' => '[[' . $wgContLang->getNsText( NS_MEDIA ) . ':',
'close' => ']]',
'tip' => wfMessage( 'media_tip' )->text(),
) : false,
array(
- 'image' => $wgLang->getImageFile( 'button-nowiki' ),
'id' => 'mw-editbutton-nowiki',
'open' => "<nowiki>",
'close' => "</nowiki>",
'tip' => wfMessage( 'nowiki_tip' )->text(),
),
array(
- 'image' => $wgLang->getImageFile( 'button-sig' ),
'id' => 'mw-editbutton-signature',
'open' => '--~~~~',
'close' => '',
'tip' => wfMessage( 'sig_tip' )->text(),
),
array(
- 'image' => $wgLang->getImageFile( 'button-hr' ),
'id' => 'mw-editbutton-hr',
'open' => "\n----\n",
'close' => '',
}
$params = array(
- $wgStylePath . '/common/images/' . $tool['image'],
+ // Images are defined in ResourceLoaderEditToolbarModule
+ false,
// Note that we use the tip both for the ALT tag and the TITLE tag of the image.
// Older browsers show a "speedtip" type message only for ALT.
// Ideally these should be different, realistically they