From 05a695450a5ede0300728419def8815b603fab1f Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Wed, 14 Jun 2006 00:56:22 +0000
Subject: merge r1353 from branch-1_6 to trunk (bug 389: font tag allowed in
 category html description for subcatify)

git-svn-id: http://piwigo.org/svn/trunk@1354 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/category_recent_cats.inc.php | 2 +-
 include/category_subcats.inc.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/category_recent_cats.inc.php b/include/category_recent_cats.inc.php
index b9aebcf2c..2663bbcb3 100644
--- a/include/category_recent_cats.inc.php
+++ b/include/category_recent_cats.inc.php
@@ -78,7 +78,7 @@ if ($conf['subcatify'])
   $comment = null;
   if (isset($row['comment']))
   {
-    $comment = strip_tags($row['comment'], '<a><br><p><b><i><small><strong>');
+    $comment = strip_tags($row['comment'], '<a><br><p><b><i><small><strong><font>');
   }
 
   // for each category, we have to search a recent picture to display and
diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index 60a7c4225..aefe8e392 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -94,7 +94,7 @@ SELECT representative_picture_id
   $comment = null;
   if (isset($row['comment']))
   {
-    $comment = strip_tags($row['comment'], '<a><br><p><b><i><small><strong>');
+    $comment = strip_tags($row['comment'], '<a><br><p><b><i><small><strong><font>');
   }
 
   if (isset($image_id))
-- 
cgit v1.2.3