merge r6402 from trunk

removed unnecessary language key (Controversy) and potential sql fatal error in admin photo rating page

git-svn-id: http://piwigo.org/svn/branches/2.1@6403 68402e56-0260-453c-a942-63ccdbb3a9ee

admin/rating.php

@@ -134,11 +134,9 @@ $available_order_by= array(
     array(l10n('Average rate'), 'average_rate DESC'),
     array(l10n('Number of rates'), 'nb_rates DESC'),
     array(l10n('Sum of rates'), 'sum_rates DESC'),
-    array(l10n('Controversy'), 'std_rates DESC'),
     array(l10n('File name'), 'file DESC'),
     array(l10n('Creation date'), 'date_creation DESC'),
     array(l10n('Post date'), 'date_available DESC'),
-
   );
 
 for ($i=0; $i<count($available_order_by); $i++)
@@ -252,4 +250,4 @@ ORDER BY date DESC;';
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+
 $template->assign_var_from_handle('ADMIN_CONTENT', 'rating');
-?>
+?>