| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -561,6 +561,10 @@ |
| 562 | 562 | 'recreate-deleted-warn', |
| 563 | 563 | 'expensive-parserfunction-warning', |
| 564 | 564 | 'expensive-parserfunction-category', |
| | 565 | + 'post-expand-template-inclusion-warning', |
| | 566 | + 'post-expand-template-inclusion-category', |
| | 567 | + 'post-expand-template-argument-warning', |
| | 568 | + 'post-expand-template-argument-category', |
| 565 | 569 | ), |
| 566 | 570 | 'undo' => array( |
| 567 | 571 | 'undo-success', |
| Index: trunk/phase3/includes/ParserOutput.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | $mNoGallery, # No gallery on category page? (__NOGALLERY__) |
| 23 | 23 | $mHeadItems, # Items to put in the <head> section |
| 24 | 24 | $mOutputHooks, # Hook tags as per $wgParserOutputHooks |
| 25 | | - $mWarnings, # Warning text to be returned to the user. Wikitext formatted. |
| | 25 | + $mWarnings, # Warning text to be returned to the user. Wikitext formatted, in the key only |
| 26 | 26 | $mSections, # Table of contents |
| 27 | 27 | $mProperties; # Name/value pairs to be cached in the DB |
| 28 | 28 | |
| — | — | @@ -68,7 +68,7 @@ |
| 69 | 69 | function getNoGallery() { return $this->mNoGallery; } |
| 70 | 70 | function getSubtitle() { return $this->mSubtitle; } |
| 71 | 71 | function getOutputHooks() { return (array)$this->mOutputHooks; } |
| 72 | | - function getWarnings() { return isset( $this->mWarnings ) ? $this->mWarnings : array(); } |
| | 72 | + function getWarnings() { return array_keys( $this->mWarnings ); } |
| 73 | 73 | |
| 74 | 74 | function containsOldMagic() { return $this->mContainsOldMagic; } |
| 75 | 75 | function setText( $text ) { return wfSetVar( $this->mText, $text ); } |
| — | — | @@ -82,7 +82,7 @@ |
| 83 | 83 | function addCategory( $c, $sort ) { $this->mCategories[$c] = $sort; } |
| 84 | 84 | function addLanguageLink( $t ) { $this->mLanguageLinks[] = $t; } |
| 85 | 85 | function addExternalLink( $url ) { $this->mExternalLinks[$url] = 1; } |
| 86 | | - function addWarning( $s ) { $this->mWarnings[] = $s; } |
| | 86 | + function addWarning( $s ) { $this->mWarnings[$s] = 1; } |
| 87 | 87 | |
| 88 | 88 | function addOutputHook( $hook, $data = false ) { |
| 89 | 89 | $this->mOutputHooks[] = array( $hook, $data ); |
| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -394,14 +394,7 @@ |
| 395 | 395 | } |
| 396 | 396 | global $wgExpensiveParserFunctionLimit; |
| 397 | 397 | if ( $this->mExpensiveFunctionCount > $wgExpensiveParserFunctionLimit ) { |
| 398 | | - if ( is_callable( array( $this->mOutput, 'addWarning' ) ) ) { |
| 399 | | - $warning = wfMsg( 'expensive-parserfunction-warning', $this->mExpensiveFunctionCount, $wgExpensiveParserFunctionLimit ); |
| 400 | | - $this->mOutput->addWarning( $warning ); |
| 401 | | - $cat = Title::makeTitleSafe( NS_CATEGORY, wfMsgForContent( 'expensive-parserfunction-category' ) ); |
| 402 | | - if ( $cat ) { |
| 403 | | - $this->mOutput->addCategory( $cat->getDBkey(), $this->getDefaultSort() ); |
| 404 | | - } |
| 405 | | - } |
| | 398 | + $this->limitationWarn( 'expensive-parserfunction', $this->mExpensiveFunctionCount, $wgExpensiveParserFunctionLimit ); |
| 406 | 399 | } |
| 407 | 400 | |
| 408 | 401 | wfRunHooks( 'ParserAfterTidy', array( &$this, &$text ) ); |
| — | — | @@ -2703,6 +2696,28 @@ |
| 2704 | 2697 | } |
| 2705 | 2698 | |
| 2706 | 2699 | /** |
| | 2700 | + * Warn the user when a parser limitation is reached |
| | 2701 | + * Will warn at most once the user per limitation type |
| | 2702 | + * |
| | 2703 | + * @param string $limitationType, should be one of : |
| | 2704 | + * 'expensive-parserfunction' |
| | 2705 | + * 'post-expand-template-argument' |
| | 2706 | + * 'post-expand-template-inclusion' |
| | 2707 | + * @params int $current, $max When an explicit limit has been |
| | 2708 | + * exceeded, provide the values (optional) |
| | 2709 | + */ |
| | 2710 | + function limitationWarn( $limitationType, $current=null, $max=null) { |
| | 2711 | + $msgName = $limitationType . '-warning'; |
| | 2712 | + //does no harm if $current and $max are present but are unnecessary for the message |
| | 2713 | + $warning = wfMsg( $msgName, $current, $max); |
| | 2714 | + $this->mOutput->addWarning( $warning ); |
| | 2715 | + $cat = Title::makeTitleSafe( NS_CATEGORY, wfMsgForContent( $limitationType . '-category' ) ); |
| | 2716 | + if ( $cat ) { |
| | 2717 | + $this->mOutput->addCategory( $cat->getDBkey(), $this->getDefaultSort() ); |
| | 2718 | + } |
| | 2719 | + } |
| | 2720 | + |
| | 2721 | + /** |
| 2707 | 2722 | * Return the text of a template, after recursively |
| 2708 | 2723 | * replacing any variables or templates within the template. |
| 2709 | 2724 | * |
| — | — | @@ -2988,6 +3003,7 @@ |
| 2989 | 3004 | # Error, oversize inclusion |
| 2990 | 3005 | $text = "[[$originalTitle]]" . |
| 2991 | 3006 | $this->insertStripItem( '<!-- WARNING: template omitted, post-expand include size too large -->' ); |
| | 3007 | + $this->limitationWarn( 'post-expand-template-inclusion' ); |
| 2992 | 3008 | } |
| 2993 | 3009 | |
| 2994 | 3010 | if ( $isLocalObj ) { |
| — | — | @@ -3186,6 +3202,7 @@ |
| 3187 | 3203 | } |
| 3188 | 3204 | if ( !$this->incrementIncludeSize( 'arg', strlen( $text ) ) ) { |
| 3189 | 3205 | $error = '<!-- WARNING: argument omitted, expansion size too large -->'; |
| | 3206 | + $this->limitationWarn( 'post-expand-template-argument' ); |
| 3190 | 3207 | } |
| 3191 | 3208 | |
| 3192 | 3209 | if ( $text === false && $object === false ) { |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1142,6 +1142,10 @@ |
| 1143 | 1143 | |
| 1144 | 1144 | It should have less than $2, there are now $1.', |
| 1145 | 1145 | 'expensive-parserfunction-category' => 'Pages with too many expensive parser function calls', |
| | 1146 | +'post-expand-template-inclusion-warning' => "Warning: Template include size is too large, some templates will not be included.", |
| | 1147 | +'post-expand-template-inclusion-category' => "Pages where template include size is exceeded", |
| | 1148 | +'post-expand-template-argument-warning' => "Warning: This page contains at least one template argument which has a too large expansion size. These arguments have been omitted.", |
| | 1149 | +'post-expand-template-argument-category' => "Pages containing omitted template arguments", |
| 1146 | 1150 | |
| 1147 | 1151 | # "Undo" feature |
| 1148 | 1152 | 'undo-success' => 'The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.', |
| Index: trunk/phase3/languages/messages/MessagesFr.php |
| — | — | @@ -812,6 +812,10 @@ |
| 813 | 813 | |
| 814 | 814 | Il devrait en avoir moins de $2 sur le nombre actuel $1.', |
| 815 | 815 | 'expensive-parserfunction-category' => 'Pages avec trop d’appels dispendieux de fonctions parseurs', |
| | 816 | +'post-expand-template-inclusion-warning' => "Attention : Cette page contient trop d'inclusions de modèles. Certaines inclusions ne seront pas effectuées.", |
| | 817 | +'post-expand-template-inclusion-category' => "Pages contenant trop d'inclusions de modèles", |
| | 818 | +'post-expand-template-argument-warning' => "Attention : Cette page contient au moins un paramètre de modèle dont l'inclusion est rendue impossible. Après extension, celui-ci aurait produit un résultat trop long, il n'a donc pas été inclut" |
| | 819 | +'post-expand-template-argument-category' => "Pages contenant au moins un paramètre de modèle non évalué", |
| 816 | 820 | |
| 817 | 821 | # "Undo" feature |
| 818 | 822 | 'undo-success' => 'Cette modification va être défaite. Veuillez confirmer les changements (visibles en bas de cette page), puis sauvegarder si vous êtes d’accord. Merci de motiver l’annulation dans la boîte de résumé.', |
