aboutsummaryrefslogtreecommitdiffstats
path: root/admin/cat_modify.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-02-28 01:13:16 +0000
committerrvelices <rv-github@modusoptimus.com>2006-02-28 01:13:16 +0000
commit4cd5b05d406a9820a0523ac26f254f4ce4fd5147 (patch)
treeb47f717b8fe3bc3e8a3357b112e22cea96bf9188 /admin/cat_modify.php
parentd4646f39d2259d4b4ba619b8f2b8aa61f9be74b5 (diff)
remake of Remote sites and synchronize: final integration and old code cleanup
fix: xml getAttribute always decodes html entities and added encodeAttribute function git-svn-id: http://piwigo.org/svn/trunk@1058 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/cat_modify.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 8291e9030..309425c91 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far)
// | file : $RCSfile$
@@ -258,7 +258,6 @@ if (!$category['is_virtual']) //!empty($category['dir']))
array('CATEGORY_DIR'=>preg_replace('/\/$/',
'',
get_complete_dir($category['id']))));
- $template->assign_block_vars('upload' ,array());
}
else
{
@@ -300,7 +299,8 @@ SELECT id,name,uppercats,global_rank
);
}
-if (is_numeric($category['site_id']) and $category['site_id'] != 1)
+$category['cat_dir'] = get_complete_dir($_GET['cat_id']);
+if (is_numeric($category['site_id']) and url_is_remote($category['cat_dir']) )
{
$query = '
SELECT galleries_url
@@ -311,6 +311,11 @@ SELECT galleries_url
$template->assign_block_vars('server', array('SITE_URL' => $galleries_url));
}
+if (!$category['is_virtual'] and !url_is_remote($category['cat_dir']) )
+{
+ $template->assign_block_vars('upload' ,array());
+}
+
//----------------------------------------------------------- sending html code
$template->assign_var_from_handle('ADMIN_CONTENT', 'categories');
?>