Fixes for double-quoting

diff --git a/inc/functions.php b/inc/functions.php
index 0d11b7f068a7c2b06f0409adfcabe0e0710e16aa..00fa83fa9c60f18353612907f2b530b0cd010b19 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3565,7 +3565,7 @@ function linenumberCode ($code)    {
                $r .= '</span>|';
 
                // Add code
-               $r .= '<span class="linetext">' . secureString($c) . '</span></div>';
+               $r .= '<span class="linetext">' . htmlentities($c) . '</span></div>';
        }
 
        return '<div class="code">' . $r . '</div>';
@@ -3684,8 +3684,8 @@ function escapeQuotes ($str, $single = false) {
                // Escape all (including null)
                $str = addslashes($str);
        } else {
-               // Escape only double-quotes
-               $str = str_replace('"', "\\\"", $str);
+               // Escape only double-quotes but prevent double-quoting
+               $str = stripslashes(str_replace('"', "\\\"", $str));
        }
 
        // Return the escaped string