ApiEmailUser.php: fix copyright symbol, spacing and coding style tweaks, spaces ...

[lhc/web/wiklou.git] / includes / Pager.php

diff --git a/includes/Pager.php b/includes/Pager.php
index 825a046..e5eef1f 100644 (file)
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -233,6 +233,13 @@ abstract class IndexPager implements Pager {
                }
        }
 
+       /**
+        * Get some text to go in brackets in the "function name" part of the SQL comment
+        */
+       function getSqlComment() {
+               return get_class( $this );
+       }
+
        /**
         * Do a query with specified parameters, rather than using the object
         * context
@@ -243,7 +250,7 @@ abstract class IndexPager implements Pager {
         * @return ResultWrapper
         */
        function reallyDoQuery( $offset, $limit, $descending ) {
-               $fname = __METHOD__ . ' (' . get_class( $this ) . ')';
+               $fname = __METHOD__ . ' (' . $this->getSqlComment() . ')';
                $info = $this->getQueryInfo();
                $tables = $info['tables'];
                $fields = $info['fields'];
@@ -909,8 +916,8 @@ abstract class TablePager extends IndexPager {
                $disabledTexts = array();
                foreach ( $labels as $type => $label ) {
                        $msgLabel = wfMsgHtml( $label );
-                       $linkTexts[$type] = "<img src=\"$path/{$images[$type]}\" alt=\"$msgLabel\"/><br/>$msgLabel";
-                       $disabledTexts[$type] = "<img src=\"$path/{$disabledImages[$type]}\" alt=\"$msgLabel\"/><br/>$msgLabel";
+                       $linkTexts[$type] = "<img src=\"$path/{$images[$type]}\" alt=\"$msgLabel\"/><br />$msgLabel";
+                       $disabledTexts[$type] = "<img src=\"$path/{$disabledImages[$type]}\" alt=\"$msgLabel\"/><br />$msgLabel";
                }
                $links = $this->getPagingLinks( $linkTexts, $disabledTexts );