| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -327,12 +327,16 @@ |
| 328 | 328 | # any necessary initialisation in the fully initialised environment |
| 329 | 329 | foreach ( $wgExtensionFunctions as $func ) { |
| 330 | 330 | # Allow closures in PHP 5.3+ |
| 331 | | - if ( is_object( $func ) && $func instanceof Closure ) |
| | 331 | + if ( is_object( $func ) && $func instanceof Closure ) { |
| 332 | 332 | $profName = $fname.'-extensions-closure'; |
| 333 | | - elseif( is_array( $func ) ) |
| 334 | | - $profName = $fname.'-extensions-'.implode( '::', $func ); |
| 335 | | - else |
| | 333 | + } elseif( is_array( $func ) ) { |
| | 334 | + if ( is_object( $func[0] ) ) |
| | 335 | + $profName = $fname.'-extensions-'.get_class( $func[0] ).'::'.$func[1]; |
| | 336 | + else |
| | 337 | + $profName = $fname.'-extensions-'.implode( '::', $func ); |
| | 338 | + } else { |
| 336 | 339 | $profName = $fname.'-extensions-'.strval( $func ); |
| | 340 | + } |
| 337 | 341 | |
| 338 | 342 | wfProfileIn( $profName ); |
| 339 | 343 | call_user_func( $func ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -296,6 +296,7 @@ |
| 297 | 297 | * (bug 19355) Added .xhtml, .xht to upload file extension blacklist |
| 298 | 298 | * (bug 19287) Workaround for lag on history page in Firefox 3.5 |
| 299 | 299 | * (bug 19564) Updated docs/hooks.txt |
| | 300 | +* (bug 18751) Fix for buggage in profiling setup for some extensions on PHP 5.1 |
| 300 | 301 | |
| 301 | 302 | == API changes in 1.16 == |
| 302 | 303 | |