| Index: branches/wmf/1.17wmf1/includes/parser/ParserOptions.php |
| — | — | @@ -281,7 +281,7 @@ |
| 282 | 282 | // since it disables the parser cache, its value will always |
| 283 | 283 | // be 0 when this function is called by parsercache. |
| 284 | 284 | // The conditional is here to avoid a confusing 0 |
| 285 | | - if ( in_array( 'stubthreshold', $forOptions ) ) |
| | 285 | + if ( true || in_array( 'stubthreshold', $forOptions ) ) |
| 286 | 286 | $confstr .= '!0' ; |
| 287 | 287 | else |
| 288 | 288 | $confstr .= '!*' ; |
| Index: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -207,6 +207,7 @@ |
| 208 | 208 | foreach ( $name as $key => $value ) { |
| 209 | 209 | $this->register( $key, $value ); |
| 210 | 210 | } |
| | 211 | + wfProfileOut( __METHOD__ ); |
| 211 | 212 | return; |
| 212 | 213 | } |
| 213 | 214 | |
| Property changes on: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 214 | 215 | Merged /trunk/phase3/includes/resourceloader/ResourceLoader.php:r81778 |