| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -1913,6 +1913,7 @@ |
| 1914 | 1914 | if ( !$rev ) { |
| 1915 | 1915 | wfDebug( "Article::replaceSection asked for bogus section (page: " . |
| 1916 | 1916 | $this->getId() . "; section: $section; edittime: $edittime)\n" ); |
| | 1917 | + wfProfileOut( __METHOD__ ); |
| 1917 | 1918 | return null; |
| 1918 | 1919 | } |
| 1919 | 1920 | |
| — | — | @@ -2097,12 +2098,12 @@ |
| 2098 | 2099 | $flags & EDIT_MINOR, null, null, &$flags, &$status ) ) ) |
| 2099 | 2100 | { |
| 2100 | 2101 | wfDebug( __METHOD__ . ": ArticleSave hook aborted save!\n" ); |
| 2101 | | - wfProfileOut( __METHOD__ ); |
| 2102 | 2102 | |
| 2103 | 2103 | if ( $status->isOK() ) { |
| 2104 | 2104 | $status->fatal( 'edit-hook-aborted' ); |
| 2105 | 2105 | } |
| 2106 | 2106 | |
| | 2107 | + wfProfileOut( __METHOD__ ); |
| 2107 | 2108 | return $status; |
| 2108 | 2109 | } |
| 2109 | 2110 | |
| Index: trunk/phase3/includes/AjaxDispatcher.php |
| — | — | @@ -133,7 +133,7 @@ |
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | |
| | 137 | + $wgOut = null; |
| 137 | 138 | wfProfileOut( __METHOD__ ); |
| 138 | | - $wgOut = null; |
| 139 | 139 | } |
| 140 | 140 | } |
| Index: trunk/phase3/includes/db/DatabaseIbm_db2.php |
| — | — | @@ -280,7 +280,7 @@ |
| 281 | 281 | $this->setDB2Option( 'rowcount', 'DB2_ROWCOUNT_PREFETCH_ON', |
| 282 | 282 | self::STMT_OPTION ); |
| 283 | 283 | |
| 284 | | - parent::__construct( $server, $user, $password, $dbName, $flags ); |
| | 284 | + parent::__construct( $server, $user, $password, $dbName, DBO_TRX | $flags ); |
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | /** |
| — | — | @@ -344,6 +344,7 @@ |
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | if ( strlen( $user ) < 1 ) { |
| | 348 | + wfProfileOut( __METHOD__ ); |
| 348 | 349 | return null; |
| 349 | 350 | } |
| 350 | 351 | |
| — | — | @@ -371,6 +372,8 @@ |
| 372 | 373 | "Server: $server, Database: $dbName, User: $user, Password: " |
| 373 | 374 | . substr( $password, 0, 3 ) . "...\n" ); |
| 374 | 375 | $this->installPrint( $this->lastError() . "\n" ); |
| | 376 | + |
| | 377 | + wfProfileOut( __METHOD__ ); |
| 375 | 378 | return null; |
| 376 | 379 | } |
| 377 | 380 | |
| Index: trunk/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -428,6 +428,7 @@ |
| 429 | 429 | if ( $i === false ) { |
| 430 | 430 | $this->mLastError = 'No working slave server: ' . $this->mLastError; |
| 431 | 431 | $this->reportConnectionError( $this->mErrorConnection ); |
| | 432 | + wfProfileOut( __METHOD__ ); |
| 432 | 433 | return false; |
| 433 | 434 | } |
| 434 | 435 | } |
| Index: trunk/phase3/includes/Export.php |
| — | — | @@ -177,8 +177,8 @@ |
| 178 | 178 | "</id>" . |
| 179 | 179 | "</contributor>"; |
| 180 | 180 | } |
| | 181 | + $this->author_list .= "</contributors>"; |
| 181 | 182 | wfProfileOut( __METHOD__ ); |
| 182 | | - $this->author_list .= "</contributors>"; |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | protected function dumpFrom( $cond = '' ) { |
| Index: trunk/phase3/includes/resourceloader/ResourceLoaderFileModule.php |
| — | — | @@ -353,6 +353,7 @@ |
| 354 | 354 | // If a module is nothing but a list of dependencies, we need to avoid |
| 355 | 355 | // giving max() an empty array |
| 356 | 356 | if ( count( $files ) === 0 ) { |
| | 357 | + wfProfileOut( __METHOD__ ); |
| 357 | 358 | return $this->modifiedTime[$context->getHash()] = 1; |
| 358 | 359 | } |
| 359 | 360 | |
| — | — | @@ -362,6 +363,7 @@ |
| 363 | 364 | $this->modifiedTime[$context->getHash()] = max( |
| 364 | 365 | $filesMtime, |
| 365 | 366 | $this->getMsgBlobMtime( $context->getLanguage() ) ); |
| | 367 | + |
| 366 | 368 | wfProfileOut( __METHOD__ ); |
| 367 | 369 | return $this->modifiedTime[$context->getHash()]; |
| 368 | 370 | } |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -2103,8 +2103,6 @@ |
| 2104 | 2104 | Title::purgeExpiredRestrictions(); |
| 2105 | 2105 | } |
| 2106 | 2106 | |
| 2107 | | - wfProfileOut( __METHOD__ ); |
| 2108 | | - |
| 2109 | 2107 | if ( $getPages ) { |
| 2110 | 2108 | $this->mCascadeSources = $sources; |
| 2111 | 2109 | $this->mCascadingRestrictions = $pagerestrictions; |
| — | — | @@ -2112,6 +2110,7 @@ |
| 2113 | 2111 | $this->mHasCascadingRestrictions = $sources; |
| 2114 | 2112 | } |
| 2115 | 2113 | |
| | 2114 | + wfProfileOut( __METHOD__ ); |
| 2116 | 2115 | return array( $sources, $pagerestrictions ); |
| 2117 | 2116 | } |
| 2118 | 2117 | |
| Index: trunk/phase3/includes/job/RefreshLinksJob.php |
| — | — | @@ -99,6 +99,8 @@ |
| 100 | 100 | $jobs[] = new RefreshLinksJob( $title, '' ); |
| 101 | 101 | } |
| 102 | 102 | Job::batchInsert( $jobs ); |
| | 103 | + |
| | 104 | + wfProfileOut( __METHOD__ ); |
| 103 | 105 | return true; |
| 104 | 106 | } |
| 105 | 107 | # Re-parse each page that transcludes this page and update their tracking links... |
| Index: trunk/phase3/includes/specials/SpecialAllmessages.php |
| — | — | @@ -202,8 +202,8 @@ |
| 203 | 203 | |
| 204 | 204 | // Normalise message names so they look like page titles |
| 205 | 205 | $messageNames = array_map( array( $this->lang, 'ucfirst' ), $messageNames ); |
| 206 | | - wfProfileIn( __METHOD__ ); |
| 207 | 206 | |
| | 207 | + wfProfileOut( __METHOD__ ); |
| 208 | 208 | return $messageNames; |
| 209 | 209 | } |
| 210 | 210 | |
| Index: trunk/phase3/thumb.php |
| — | — | @@ -56,11 +56,13 @@ |
| 57 | 57 | $bits = explode( '!', $fileName, 2 ); |
| 58 | 58 | if( !isset($bits[1]) ) { |
| 59 | 59 | wfThumbError( 404, wfMsg( 'badtitletext' ) ); |
| | 60 | + wfProfileOut( __METHOD__ ); |
| 60 | 61 | return; |
| 61 | 62 | } |
| 62 | 63 | $title = Title::makeTitleSafe( NS_FILE, $bits[1] ); |
| 63 | 64 | if( is_null($title) ) { |
| 64 | 65 | wfThumbError( 404, wfMsg( 'badtitletext' ) ); |
| | 66 | + wfProfileOut( __METHOD__ ); |
| 65 | 67 | return; |
| 66 | 68 | } |
| 67 | 69 | $img = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $fileName ); |
| — | — | @@ -73,6 +75,7 @@ |
| 74 | 76 | if ( !$img->getTitle()->userCanRead() ) { |
| 75 | 77 | wfThumbError( 403, 'Access denied. You do not have permission to access ' . |
| 76 | 78 | 'the source file.' ); |
| | 79 | + wfProfileOut( __METHOD__ ); |
| 77 | 80 | return; |
| 78 | 81 | } |
| 79 | 82 | $headers[] = 'Cache-Control: private'; |
| — | — | @@ -81,15 +84,18 @@ |
| 82 | 85 | |
| 83 | 86 | if ( !$img ) { |
| 84 | 87 | wfThumbError( 404, wfMsg( 'badtitletext' ) ); |
| | 88 | + wfProfileOut( __METHOD__ ); |
| 85 | 89 | return; |
| 86 | 90 | } |
| 87 | 91 | if ( !$img->exists() ) { |
| 88 | 92 | wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' ); |
| | 93 | + wfProfileOut( __METHOD__ ); |
| 89 | 94 | return; |
| 90 | 95 | } |
| 91 | 96 | $sourcePath = $img->getPath(); |
| 92 | 97 | if ( $sourcePath === false ) { |
| 93 | 98 | wfThumbError( 500, 'The source file is not locally accessible.' ); |
| | 99 | + wfProfileOut( __METHOD__ ); |
| 94 | 100 | return; |
| 95 | 101 | } |
| 96 | 102 | |
| — | — | @@ -105,6 +111,7 @@ |
| 106 | 112 | wfRestoreWarnings(); |
| 107 | 113 | if ( $stat['mtime'] <= $imsUnix ) { |
| 108 | 114 | header( 'HTTP/1.1 304 Not Modified' ); |
| | 115 | + wfProfileOut( __METHOD__ ); |
| 109 | 116 | return; |
| 110 | 117 | } |
| 111 | 118 | } |
| — | — | @@ -116,11 +123,13 @@ |
| 117 | 124 | |
| 118 | 125 | if ( is_file( $thumbPath ) ) { |
| 119 | 126 | wfStreamFile( $thumbPath, $headers ); |
| | 127 | + wfProfileOut( __METHOD__ ); |
| 120 | 128 | return; |
| 121 | 129 | } |
| 122 | 130 | } |
| 123 | 131 | } catch ( MWException $e ) { |
| 124 | 132 | wfThumbError( 500, $e->getHTML() ); |
| | 133 | + wfProfileOut( __METHOD__ ); |
| 125 | 134 | return; |
| 126 | 135 | } |
| 127 | 136 | |