X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=blobdiff_plain;f=includes%2FEditPage.php;h=fe0014992034ede7b65a5abf3d63eaa309a02297;hb=4bfbf2c225d7f45aff167613f35d7d9153abe252;hp=9d897857d522a7ee92c7d61291003154538f9a1d;hpb=6ebfe8578c8a14913df2426583a68b2a0803e6d2;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/EditPage.php b/includes/EditPage.php index 9d897857d5..fe00149920 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1156,7 +1156,7 @@ class EditPage { $out->showErrorPage( 'modeleditnotsupported-title', 'modeleditnotsupported-text', - $modelName + [ $modelName ] ); return false; } @@ -1188,7 +1188,7 @@ class EditPage { /** * @param Content|null $def_content The default value to return * - * @return Content|null Content on success, $def_content for invalid sections + * @return Content|false|null Content on success, $def_content for invalid sections * * @since 1.21 */ @@ -1683,7 +1683,9 @@ class EditPage { case self::AS_CANNOT_USE_CUSTOM_MODEL: case self::AS_PARSE_ERROR: case self::AS_UNICODE_NOT_SUPPORTED: - $out->wrapWikiTextAsInterface( 'error', $status->getWikiText() ); + $out->wrapWikiTextAsInterface( 'error', + $status->getWikiText( false, false, $this->context->getLanguage() ) + ); return true; case self::AS_SUCCESS_NEW_ARTICLE: @@ -1757,7 +1759,8 @@ class EditPage { // is if an extension hook aborted from inside ArticleSave. // Render the status object into $this->hookError // FIXME this sucks, we should just use the Status object throughout - $this->hookError = '