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

remake of Remote sites and synchronize: final integration and old code cleanup

Browse Source 
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
This commit is contained in:
rvelices
2006-02-28 01:13:16 +00:00
parent d4646f39d2
commit 4cd5b05d40
18 changed files with 1760 additions and 3415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/cat_modify.php
+8 -3
View File
@@ -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');
?>