aboutsummaryrefslogtreecommitdiffstats
path: root/include/category_default.inc.php
diff options
context:
space:
mode:
authorz0rglub <z0rglub@piwigo.org>2004-09-01 21:39:29 +0000
committerz0rglub <z0rglub@piwigo.org>2004-09-01 21:39:29 +0000
commit2dbc66da3bcb2903055b0269f65f9db18174c87b (patch)
treee80ccf0d4c0c6d135a24f221f4cf52a01b4340b3 /include/category_default.inc.php
parentf13b345dcfcab905a091d419073e0550d7e7cb1b (diff)
- new special category : random pictures
- reorganisation of special categories menu : template is used only for template. A special category is presented as the template tells to do so. - favorites becomes just another special category - bug correction for best rated category : wrong MySQL query if user has forbidden categories (see include/functions_category.inc.php diff) git-svn-id: http://piwigo.org/svn/trunk@510 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/category_default.inc.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 409829282..6eba15e8c 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -38,7 +38,7 @@
$array_cat_directories = array();
$query = '
-SELECT DISTINCT(id),file,date_available
+SELECT DISTINCT(id),file,date_available,category_id
,tn_ext,name,filesize,storage_category_id,average_rate
FROM '.IMAGES_TABLE.' AS i
INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=ic.image_id
@@ -113,7 +113,15 @@ while ($row = mysql_fetch_array($result))
}
$thumbnail_title .= ' : '.$filesize.' KB';
// url link on picture.php page
- $url_link = PHPWG_ROOT_PATH.'picture.php?cat='.$page['cat'];
+ $url_link = PHPWG_ROOT_PATH.'picture.php?';
+ if ($page['cat'] == 'random')
+ {
+ $url_link.= 'cat='.$row['category_id'];
+ }
+ else
+ {
+ $url_link.= 'cat='.$page['cat'];
+ }
$url_link.= '&amp;image_id='.$row['id'];
if ($page['cat'] == 'search')
{