aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-04-27 04:23:08 +0000
committerrvelices <rv-github@modusoptimus.com>2007-04-27 04:23:08 +0000
commit53522d541178c182d5926cffd56c00edeed37b7b (patch)
tree77d7cd74c9f9022e948894692341357dc208aab2
parent5b0d26b779b6835b43e1d6dedd154d8efb0f8cf1 (diff)
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
-rw-r--r--include/section_init.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 34d02c1b7..24efb8319 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -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']))