From: <var...@us...> - 2013-05-29 08:17:48
|
Revision: 8790 http://sourceforge.net/p/phpwiki/code/8790 Author: vargenau Date: 2013-05-29 08:17:45 +0000 (Wed, 29 May 2013) Log Message: ----------- Revert Modified Paths: -------------- trunk/lib/wikilens/PageListColumns.php Modified: trunk/lib/wikilens/PageListColumns.php =================================================================== --- trunk/lib/wikilens/PageListColumns.php 2013-05-29 07:32:07 UTC (rev 8789) +++ trunk/lib/wikilens/PageListColumns.php 2013-05-29 08:17:45 UTC (rev 8790) @@ -154,8 +154,6 @@ { $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 @@ 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 @@ { $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 @@ 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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |