| Index: branches/REL1_18/phase3/includes/Article.php |
| — | — | @@ -1765,6 +1765,7 @@ |
| 1766 | 1766 | global $wgEnableParserCache, $wgUser; |
| 1767 | 1767 | $user = is_null( $user ) ? $wgUser : $user; |
| 1768 | 1768 | |
| | 1769 | + wfProfileIn( __METHOD__ ); |
| 1769 | 1770 | // Should the parser cache be used? |
| 1770 | 1771 | $useParserCache = $wgEnableParserCache && |
| 1771 | 1772 | $user->getStubThreshold() == 0 && |
| — | — | @@ -1780,6 +1781,7 @@ |
| 1781 | 1782 | if ( $useParserCache ) { |
| 1782 | 1783 | $parserOutput = ParserCache::singleton()->get( $this, $this->mPage->getParserOptions() ); |
| 1783 | 1784 | if ( $parserOutput !== false ) { |
| | 1785 | + wfProfileOut( __METHOD__ ); |
| 1784 | 1786 | return $parserOutput; |
| 1785 | 1787 | } |
| 1786 | 1788 | } |
| — | — | @@ -1790,11 +1792,13 @@ |
| 1791 | 1793 | } else { |
| 1792 | 1794 | $rev = Revision::newFromTitle( $this->getTitle(), $oldid ); |
| 1793 | 1795 | if ( $rev === null ) { |
| | 1796 | + wfProfileOut( __METHOD__ ); |
| 1794 | 1797 | return false; |
| 1795 | 1798 | } |
| 1796 | 1799 | $text = $rev->getText(); |
| 1797 | 1800 | } |
| 1798 | 1801 | |
| | 1802 | + wfProfileOut( __METHOD__ ); |
| 1799 | 1803 | return $this->getOutputFromWikitext( $text, $useParserCache ); |
| 1800 | 1804 | } |
| 1801 | 1805 | |
| Index: branches/REL1_18/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -707,7 +707,7 @@ |
| 708 | 708 | |
| 709 | 709 | if ( !is_object( $conn ) ) { |
| 710 | 710 | // No last connection, probably due to all servers being too busy |
| 711 | | - wfLogDBError( "LB failure with no last connection\n" ); |
| | 711 | + wfLogDBError( "LB failure with no last connection. Connection error: {$this->mLastError}\n" ); |
| 712 | 712 | $conn = new Database; |
| 713 | 713 | // If all servers were busy, mLastError will contain something sensible |
| 714 | 714 | throw new DBConnectionError( $conn, $this->mLastError ); |
| Property changes on: branches/REL1_18/phase3/includes/db/LoadBalancer.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 715 | 715 | Merged /trunk/phase3/includes/db/LoadBalancer.php:r93682-93683,93851 |