X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=blobdiff_plain;f=includes%2FEditPage.php;h=870e2e005616186ed6e860885410cc2eb6fe6dbe;hb=df2ef5194e88514081511302da45ebf19afcb248;hp=352253163c64a167ac8d413b5e3820515f3498ce;hpb=14bd570d48ab820b1ca19668665d8f96cac9766f;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 352253163c..870e2e0056 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2838,7 +2838,7 @@ class EditPage {
'{{fullurl:Special:UserLogin/signup|returnto={{FULLPAGENAMEE}}}}' ]
);
} else {
- $wgOut->wrapWikiMsg( "
\n$1
",
+ $wgOut->wrapWikiMsg( "\n$1
",
'anonpreviewwarning'
);
}
@@ -3596,7 +3596,7 @@ HTML
*/
function getPreviewText() {
global $wgOut, $wgUser, $wgRawHtml, $wgLang;
- global $wgAllowUserCss, $wgAllowUserJs;
+ global $wgAllowUserCss, $wgAllowUserJs, $wgAjaxEditStash;
$stats = $wgOut->getContext()->getStats();
@@ -3708,10 +3708,12 @@ HTML
# Try to stash the edit for the final submission step
# @todo: different date format preferences cause cache misses
- ApiStashEdit::stashEditFromPreview(
- $this->getArticle(), $content, $pstContent,
- $parserOutput, $parserOptions, $parserOptions, wfTimestampNow()
- );
+ if ( $wgAjaxEditStash ) {
+ ApiStashEdit::stashEditFromPreview(
+ $this->getArticle(), $content, $pstContent,
+ $parserOutput, $parserOptions, $parserOptions, wfTimestampNow()
+ );
+ }
$parserOutput->setEditSectionTokens( false ); // no section edit links
$previewHTML = $parserOutput->getText();
@@ -3777,7 +3779,7 @@ HTML
* Shows a bulletin board style toolbar for common editing functions.
* It can be disabled in the user preferences.
*
- * @param $title Title object for the page being edited (optional)
+ * @param Title $title Title object for the page being edited (optional)
* @return string
*/
static function getEditToolbar( $title = null ) {
@@ -3858,7 +3860,7 @@ HTML
],
$showSignature ? [
'id' => 'mw-editbutton-signature',
- 'open' => '--~~~~',
+ 'open' => wfMessage( 'sig-text', '~~~~' )->inContentLanguage()->text(),
'close' => '',
'sample' => '',
'tip' => wfMessage( 'sig_tip' )->text(),