diff options
| author | nikrou <nikrou@piwigo.org> | 2010-05-08 18:43:50 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2010-05-08 18:43:50 +0000 |
| commit | a34af69677b6b7b3d1a7c551a0bb5ce5a9441d3c (patch) | |
| tree | 579e4c7b23c385cfd556edcbcfc221fb7f272415 /admin | |
| parent | f51c9412bada85609ea5bfd882cdab0d6214c050 (diff) | |
Amend bug 1559. standard deviation was not removed in some places.
So, sqlite crashed because std function has been removed.
git-svn-id: http://piwigo.org/svn/trunk@6125 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/rating.php | 4 | ||||
| -rw-r--r-- | admin/themes/default/template/rating.tpl | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/admin/rating.php b/admin/rating.php index a4a625c82..dc8b58664 100644 --- a/admin/rating.php +++ b/admin/rating.php @@ -169,8 +169,7 @@ SELECT i.id, i.average_rate, MAX(r.date) AS recently_rated, COUNT(r.rate) AS nb_rates, - SUM(r.rate) AS sum_rates, - ROUND(STD(r.rate),2) AS std_rates + SUM(r.rate) AS sum_rates FROM '.RATE_TABLE.' AS r LEFT JOIN '.IMAGES_TABLE.' AS i ON r.element_id = i.id WHERE 1 = 1 ' . $page['user_filter'] . ' @@ -206,7 +205,6 @@ ORDER BY date DESC;'; 'U_THUMB' => $thumbnail_src, 'U_URL' => $image_url, 'AVG_RATE' => $image['average_rate'], - 'STD_RATE' => $image['std_rates'], 'SUM_RATE' => $image['sum_rates'], 'NB_RATES' => (int)$image['nb_rates'], 'NB_RATES_TOTAL' => (int)$nb_rates, diff --git a/admin/themes/default/template/rating.tpl b/admin/themes/default/template/rating.tpl index a736470c6..eb9a63a1f 100644 --- a/admin/themes/default/template/rating.tpl +++ b/admin/themes/default/template/rating.tpl @@ -38,7 +38,6 @@ <td>{'File'|@translate}</td> <td>{'Number of rates'|@translate}</td> <td>{'Average rate'|@translate}</td> - <td>{'Controversy'|@translate}</td> <td>{'Sum of rates'|@translate}</td> <td>{'Rate'|@translate}</td> <td>{'Username'|@translate}</td> @@ -50,7 +49,6 @@ <td rowspan="{$image.NB_RATES_TOTAL+1}"><a href="{$image.U_URL}"><img src="{$image.U_THUMB}" alt="{$image.FILE}" title="{$image.FILE}"></a></td> <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.NB_RATES}/{$image.NB_RATES_TOTAL}</strong></td> <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.AVG_RATE}</strong></td> - <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.STD_RATE}</strong></td> <td rowspan="{$image.NB_RATES_TOTAL+1}" style="border-right: 1px solid;" ><strong>{$image.SUM_RATE}</strong></td> </tr> {foreach from=$image.rates item=rate name=rate} |