Use standard __METHOD__ for $fname in SpecialAllpages.php, not weird indexSomething...
authorAryeh Gregor <simetrical@users.mediawiki.org>
Fri, 9 Nov 2007 18:08:23 +0000 (18:08 +0000)
committerAryeh Gregor <simetrical@users.mediawiki.org>
Fri, 9 Nov 2007 18:08:23 +0000 (18:08 +0000)
includes/SpecialAllpages.php

index 07ff120..26ecf3b 100644 (file)
@@ -86,7 +86,6 @@ function namespaceForm ( $namespace = NS_MAIN, $from = '' ) {
  */
 function showToplevel ( $namespace = NS_MAIN, $including = false ) {
        global $wgOut, $wgContLang;
-       $fname = "indexShowToplevel";
        $align = $wgContLang->isRtl() ? 'left' : 'right';
 
        # TODO: Either make this *much* faster or cache the title index points
@@ -105,7 +104,7 @@ function showToplevel ( $namespace = NS_MAIN, $including = false ) {
                if ( ! $dbr->implicitOrderby() ) {
                        $options['ORDER BY'] = 'page_title';
                }
-               $firstTitle = $dbr->selectField( 'page', 'page_title', $where, $fname, $options );
+               $firstTitle = $dbr->selectField( 'page', 'page_title', $where, __METHOD__, $options );
                $lastTitle = $firstTitle;
 
                # This array is going to hold the page_titles in order.
@@ -122,7 +121,7 @@ function showToplevel ( $namespace = NS_MAIN, $including = false ) {
                                'page', /* FROM */
                                'page_title', /* WHAT */
                                $where + array( $chunk),
-                               $fname,
+                               __METHOD__,
                                array ('LIMIT' => 2, 'OFFSET' => $this->maxPerPage - 1, 'ORDER BY' => 'page_title') );
 
                        if ( $s = $dbr->fetchObject( $res ) ) {
@@ -133,7 +132,7 @@ function showToplevel ( $namespace = NS_MAIN, $including = false ) {
                                        array(
                                                'page_namespace' => $namespace,
                                                $chunk
-                                       ), $fname );
+                                       ), __METHOD__ );
                                array_push( $lines, $endTitle );
                                $done = true;
                        }
@@ -214,7 +213,6 @@ function showline( $inpoint, $outpoint, $namespace = NS_MAIN ) {
 function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
        global $wgOut, $wgUser, $wgContLang;
 
-       $fname = 'indexShowChunk';
        $sk = $wgUser->getSkin();
 
        $fromList = $this->getNamespaceKeyAndText($namespace, $from);
@@ -239,7 +237,7 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
                                'page_namespace' => $namespace,
                                'page_title >= ' . $dbr->addQuotes( $fromKey )
                        ),
-                       $fname,
+                       __METHOD__,
                        array(
                                'ORDER BY'  => 'page_title',
                                'LIMIT'     => $this->maxPerPage + 1,
@@ -286,7 +284,7 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
                                'page',
                                'page_title',
                                array( 'page_namespace' => $namespace, 'page_title < '.$dbr->addQuotes($from) ),
-                               $fname,
+                               __METHOD__,
                                array( 'ORDER BY' => 'page_title DESC', 'LIMIT' => $this->maxPerPage, 'OFFSET' => ($this->maxPerPage - 1 ) )
                        );
 
@@ -301,7 +299,7 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) {
                                if ( ! $dbr->implicitOrderby() ) {
                                        $options['ORDER BY'] = 'page_title';
                                }
-                               $reallyFirstPage_title = $dbr->selectField( 'page', 'page_title', array( 'page_namespace' => $namespace ), $fname, $options );
+                               $reallyFirstPage_title = $dbr->selectField( 'page', 'page_title', array( 'page_namespace' => $namespace ), __METHOD__, $options );
                                # Show the previous link if it s not the current requested chunk
                                if( $from != $reallyFirstPage_title ) {
                                        $prevTitle =  Title::makeTitle( $namespace, $reallyFirstPage_title );