adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 09:03:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 519: quick search (first version)

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@1537 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2006-08-15 02:06:06 +00:00
parent bc1f5319b1
commit 48c6d7e8a4
12 changed files with 388 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/section_init.inc.php
+4 -4
View File
@@ -450,14 +450,14 @@ SELECT image_id
{
include_once( PHPWG_ROOT_PATH .'include/functions_search.inc.php' );
$search_items = get_search_items($page['search']);
if ( !empty($search_items) )
$search_result = get_search_results($page['search']);
if ( !empty($search_result['items']) and !isset($search_result['as_is']) )
{
$query = '
SELECT DISTINCT(id)
FROM '.IMAGES_TABLE.'
INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
WHERE id IN ('.implode(',', $search_items).')
WHERE id IN ('.implode(',', $search_result['items']).')
AND '.$forbidden.'
'.$conf['order_by'].'
;';
@@ -465,7 +465,7 @@ SELECT DISTINCT(id)
}
else
{
$page['items'] = array();
$page['items'] = $search_result['items'];
}
$page = array_merge(