Changeset 1260

Timestamp:

Apr 22, 2006, 5:27:13 PM (18 years ago)

Author:

chrisaga

Message:

• merge trunk r1258:1259 into branch 1.6 (htmlentities())

Location:

branches/branch-1_6/include

Files:

• category_subcats.inc.php (modified) (2 diffs)
• functions_html.inc.php (modified) (3 diffs)

branches/branch-1_6/include/category_subcats.inc.php

@@ -150 +150 @@
         array(
           'SRC'   => $thumbnail_src_of[ $category['picture'] ],
-          'ALT'   => $category['name'],
+          'ALT'   => htmlentities($category['name'],ENT_QUOTES),
           'TITLE' => $lang['hint_category'],
           'ICON'  => get_icon(@$category['date_last']),
@@ -160 +160 @@
               )
             ),
-          'NAME' => $category['name'],
+          'NAME' => htmlentities($category['name'],ENT_QUOTES),
           'CAPTION_NB_IMAGES' => (($category['nb_images'] == 0) ? '' : sprintf("%d ".l10n('pictures'), $category['nb_images'])),
-          'DESCRIPTION' => @$category['comment'],
+          'DESCRIPTION' => htmlentities(@$category['comment'],ENT_QUOTES),
           )
         );

branches/branch-1_6/include/functions_html.inc.php

@@ -451 +451 @@
       $menu.= ' rel="up"';
     }
-    $menu.= '>'.$category['name'].'</a>';
+    $menu.= '>'.htmlentities($category['name'],ENT_QUOTES).'</a>';
 
     if ($category['nb_images'] > 0)
@@ -501 +501 @@
   $content = preg_replace($pattern, $replacement, $content);
 
-  $content = '<div>'.$content.'</div>';
+  $content = '<div>'.htmlentities($content,ENT_QUOTES).'</div>';
   return $content;
 }
@@ -551 +551 @@
     $output.=
       ' />'
-      .' '.$tag['name']
+      .' '. htmlentities($tag['name'],ENT_QUOTES)
       .'</label>'
       .'</li>'