aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-02-08 01:17:07 +0000
committerrvelices <rv-github@modusoptimus.com>2006-02-08 01:17:07 +0000
commit0e78db47de2041912447dd5bbbfafb7684e7480f (patch)
treeafb3fe9de5bdbbe5c0ce624f8ce60e65c6ef57c3 /admin/include
parent687a7ca122b56264c63830112ca43ea7db2c3c7b (diff)
- remake of Remote sites and Synchronize:
- synchronization for remote and local sites are done by the same code - remote sites can update metadata now (not before) - bug 279 - fixes bug 82: has_high column - improve feature 280: user sort by filename - fix path to template mimetypes icons - bug 284: session cookie lifetime, deletion on logout and corrected issue when db upgrades were missing git-svn-id: http://piwigo.org/svn/trunk@1029 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/functions_metadata.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index 3979e0e40..23dca79a9 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -175,11 +175,13 @@ function update_metadata($files)
* path in the filesystem
*
* @param int id_uppercat
+ * @param int site_id
* @param boolean recursive ?
* @param boolean only newly added files ?
* @return array
*/
-function get_filelist($category_id = '', $recursive = false, $only_new = false)
+function get_filelist($category_id = '', $site_id=1, $recursive = false,
+ $only_new = false)
{
// filling $cat_ids : all categories required
$cat_ids = array();
@@ -187,7 +189,7 @@ function get_filelist($category_id = '', $recursive = false, $only_new = false)
$query = '
SELECT id
FROM '.CATEGORIES_TABLE.'
- WHERE site_id = 1
+ WHERE site_id = '.$site_id.'
AND dir IS NOT NULL';
if (is_numeric($category_id))
{