From c39ca88cf8aeaa7ba7c1db9d5b7ddab857252218 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Wed, 29 May 2013 08:17:45 +0000
Subject: [PATCH] Revert

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8790 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/wikilens/PageListColumns.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/wikilens/PageListColumns.php b/lib/wikilens/PageListColumns.php
index ea6b53615..f6b080c37 100644
--- a/lib/wikilens/PageListColumns.php
+++ b/lib/wikilens/PageListColumns.php
@@ -154,8 +154,6 @@ class _PageList_Column_ratingvalue extends _PageList_Column
     {
         $this->_pagelist =& $params[3];
         $this->_user =& $params[4]; //$this->_pagelist->getOption('user');
-        if (empty($this->_user))
-            $this->_user =& RatingsUserFactory::getUser($GLOBALS['request']->_user->_userid);
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');
         if (!$this->_dimension) $this->_dimension = 0;
@@ -163,6 +161,8 @@ class _PageList_Column_ratingvalue extends _PageList_Column
 
     function format($pagelist, $page_handle, &$revision_handle)
     {
+        if (empty($this->_user))
+            $this->_user =& RatingsUserFactory::getUser($GLOBALS['request']->_user->_userid);
         assert(!empty($this->_user));
         $rating = $this->_getValue($page_handle, $revision_handle);
         $mean = $this->_user->mean_rating($this->_dimension);
@@ -229,7 +229,7 @@ class _PageList_Column_ratingwidget extends _PageList_Column_custom
     {
         $plugin = new WikiPlugin_RateIt();
         $widget = $plugin->RatingWidgetHtml($page_handle->getName(), "",
-            "BStar", $this->_dimension, "small");
+            "Star", $this->_dimension, "small");
         $td = HTML::td($widget);
         $td->setAttr('nowrap', 'nowrap');
         return $td;
@@ -237,10 +237,14 @@ class _PageList_Column_ratingwidget extends _PageList_Column_custom
 
     function _getValue($page_handle, &$revision_handle)
     {
-        // Returns average rating of a page
+        global $request;
+
         $pagename = $page_handle->getName();
-        $rdbi = RatingsDb::getTheRatingsDb();
-        return $rdbi->getAvg($pagename, $this->_dimension);
+        $active_user = $request->getUser();
+        $active_userid = $active_user->_userid;
+
+        $tu = & RatingsUserFactory::getUser($active_userid);
+        return $tu->get_rating($pagename, $this->_dimension);
     }
 
     function _getSortableValue($page_handle, &$revision_handle)
-- 
2.42.0