Added htmlentities2(). Bump to 1.4

1 files changed, 10 insertions, 2 deletions

diff --git a/index.php b/index.php
index 910fa25..05c9655 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-//  blogRight! version 1.3
+//  blogRight! version 1.4
 //  Copyright (C) 2004 Wojciech Polak.
 //
 //  This program is free software; you can redistribute it and/or modify
@@ -458,7 +458,7 @@ function indent_include ($level, $file)
         {
           for ($i = 0; $i < $level; $i++)
 	     print ' ';
-          print (htmlentities ($line));
+          print (htmlentities2 ($line));
         }
     }
 
@@ -466,6 +466,14 @@ function indent_include ($level, $file)
   }
 }
 
+function htmlentities2 ($htmlcode)
+{
+  $table = get_html_translation_table (HTML_ENTITIES, ENT_QUOTES);
+  $table[chr(38)] = '&';
+  return preg_replace ("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;",
+		       strtr ($htmlcode, $table));
+}
+
 function microtime_diff ($a, $b)
 {
   list ($a_dec, $a_sec) = explode (' ', $a);