diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/pager | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/pager')
| -rw-r--r-- | includes/pager/IndexPager.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/includes/pager/IndexPager.php b/includes/pager/IndexPager.php index ce6dc50c..7a5952f1 100644 --- a/includes/pager/IndexPager.php +++ b/includes/pager/IndexPager.php @@ -196,7 +196,7 @@ abstract class IndexPager extends ContextSource implements Pager { public function doQuery() { # Use the child class name for profiling $fname = __METHOD__ . ' (' . get_class( $this ) . ')'; - wfProfileIn( $fname ); + $section = Profiler::instance()->scopedProfileIn( $fname ); // @todo This should probably compare to DIR_DESCENDING and DIR_ASCENDING constants $descending = ( $this->mIsBackwards == $this->mDefaultDirection ); @@ -226,8 +226,6 @@ abstract class IndexPager extends ContextSource implements Pager { $this->preprocessResults( $this->mResult ); $this->mResult->rewind(); // Paranoia - - wfProfileOut( $fname ); } /** @@ -478,7 +476,6 @@ abstract class IndexPager extends ContextSource implements Pager { $attrs['class'] = "mw-{$type}link"; } - return Linker::linkKnown( $this->getTitle(), $text, |