aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2013-02-28 12:41:16 +0000
committerplegall <plg@piwigo.org>2013-02-28 12:41:16 +0000
commit3fd8143ccd0039ac4fd033beb8e83d7e18a9238d (patch)
treef7485e26ecdda6806709cd7bb0d462e5252859bc
parent42c2c3eb106588ec1fd9e713bc9b44ed0366726b (diff)
bug 2852 fixed: ability to use HTML markup in album description for pwg.categories.add
git-svn-id: http://piwigo.org/svn/trunk@21070 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions.php2
-rw-r--r--tools/piwigo_remote.pl1
2 files changed, 2 insertions, 1 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 46460a29a..957ef086e 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1253,7 +1253,7 @@ function create_virtual_category($category_name, $parent_id=null, $options=array
// any description for this album?
if (isset($options['comment']))
{
- $insert['comment'] = strip_tags($options['comment']);
+ $insert['comment'] = $conf['allow_html_descriptions'] ? $options['comment'] : strip_tags($options['comment']);
}
if (!empty($parent_id) and is_numeric($parent_id))
diff --git a/tools/piwigo_remote.pl b/tools/piwigo_remote.pl
index 5cc9193e5..b8ddeff19 100644
--- a/tools/piwigo_remote.pl
+++ b/tools/piwigo_remote.pl
@@ -240,6 +240,7 @@ if ($opt{action} eq 'pwg.categories.add') {
method => 'pwg.categories.add',
name => $opt{define}{name},
parent => $opt{define}{parent},
+ comment => $opt{define}{comment},
};
my $response = $ua->post(