merge r1983 from trunk to branch-1_7

category image order not correct

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@1984 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-04-27 04:23:08 +00:00
parent 5b0d26b779
commit 53522d5411
+2 -2
View File
@@ -224,9 +224,9 @@ if ('categories' == $page['section'])
)
)
{
if ( !empty($result['image_order']) and !isset($page['super_order_by']) )
if ( !empty($page['category']['image_order']) and !isset($page['super_order_by']) )
{
$conf[ 'order_by' ] = ' ORDER BY '.$result['image_order'];
$conf[ 'order_by' ] = ' ORDER BY '.$page['category']['image_order'];
}
if (isset($page['flat']))