Luis Felipe Schenone has submitted this change and it was merged.

Change subject: Fixed a bug and simplified the special page
......................................................................


Fixed a bug and simplified the special page

Change-Id: Ifa5d7601ea3e4c7881d699be448f8126a1951bee
---
M SpecialUserPageViewTracker.php
M UserPageViewTracker.php
M UserPageViewTracker.sql
3 files changed, 7 insertions(+), 12 deletions(-)

Approvals:
  Luis Felipe Schenone: Verified; Looks good to me, approved



diff --git a/SpecialUserPageViewTracker.php b/SpecialUserPageViewTracker.php
index 54528dc..404b1d1 100755
--- a/SpecialUserPageViewTracker.php
+++ b/SpecialUserPageViewTracker.php
@@ -56,7 +56,7 @@
                if ( $body ) {
                        $html .= $pager->getNavigationBar();
                        $html .= '<table class="wikitable" width="100%" 
cellspacing="0" cellpadding="0">';
-                       $html .= '<tr><th>User Name</th><th>Real 
Name</th><th>Page</th><th>Hits</th><th>Last</th></tr>';
+                       $html .= 
'<tr><th>Username</th><th>Page</th><th>Hits</th><th>Last</th></tr>';
                        $html .= $body;
                        $html .= '</table>';
                        $html .= $pager->getNavigationBar();
@@ -85,6 +85,7 @@
        }
 
        function getQueryInfo() {
+               global $wgDBprefix;
                list( $userpagehits ) = wfGetDB( DB_SLAVE )->tableNamesN( 
'user_page_hits' );
                $conds = array();
                if ( $this->filterUsers ) {
@@ -98,15 +99,14 @@
                        $conds[] = $excludeUsers;
                }
                $table = "(select @rownum:=@rownum+1 as rownum,";
-               $table .= "user_name, user_real_name, page_namespace, 
page_title,hits, last ";
+               $table .= "user_name, page_namespace, page_title,hits, last ";
                $table .= "from (select @rownum:=0) r, ";
-               $table .= "(select user_name, user_real_name, page_namespace, 
page_title,hits,";
-               $table .= "last from user_page_hits) p) results";
+               $table .= "(select user_name, page_namespace, page_title,hits,";
+               $table .= "last from " . $wgDBprefix . "user_page_hits) p) 
results";
                return array(
                        'tables' => " $table ",
                        'fields' => array( 'rownum',
                        'user_name',
-                       'user_real_name',
                        'page_namespace',
                        'page_title',
                        'hits',
@@ -128,11 +128,6 @@
 
                $res = '<tr>';
                $res .= '<td>' . $name . '</td><td>';
-               if ($row->user_real_name) {
-                       $res .= $row->user_real_name . '</td><td>';
-               } else {
-                       $res .= '&nbsp;</td><td>';
-               }
                $res .= "$page</td>";
                $res .= '<td style="text-align:right">' . $row->hits . '</td>';
                $res .= '<td style="text-align:center">' . $row->last . '</td>';
diff --git a/UserPageViewTracker.php b/UserPageViewTracker.php
index 62fd44f..6dff2ed 100755
--- a/UserPageViewTracker.php
+++ b/UserPageViewTracker.php
@@ -6,7 +6,7 @@
        'author'=> array( 'Kimon Andreou', 'Luis Felipe Schenone' ),
        'description' => 'Tracks the page views per page per user and displays 
it in [[Special:UserPageViewTracker]].',
        'descriptionmsg' => 'userpageviewtracker-desc',
-       'version' => '0.2',
+       'version' => 0.2,
        'url' => 'http://www.mediawiki.org/wiki/Extension:UserPageViewTracker',
 );
 
diff --git a/UserPageViewTracker.sql b/UserPageViewTracker.sql
index f9a01b6..a91d272 100755
--- a/UserPageViewTracker.sql
+++ b/UserPageViewTracker.sql
@@ -13,6 +13,6 @@
        p.page_title AS page_title,
        v.hits AS hits,
        v.last AS last
-FROM (user u JOIN page p) JOIN /*_*/user_page_views v 
+FROM (/*_*/user u JOIN /*_*/page p) JOIN /*_*/user_page_views v 
 WHERE u.user_id = v.user_id AND p.page_id = v.page_id
 ORDER BY u.user_id, v.hits DESC;
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/93070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa5d7601ea3e4c7881d699be448f8126a1951bee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserPageViewTracker
Gerrit-Branch: master
Gerrit-Owner: Luis Felipe Schenone <[email protected]>
Gerrit-Reviewer: Luis Felipe Schenone <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to