fix USER_STYLESHEET for mysql (was broken because of CR escaping

diff --git a/functions.php b/functions.php
index 3928b2a348d87179469ae7e31bbbfc605562f48c..b2694f7ecbb51a2bd1c1c897caf988c23d5dcc01 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -7059,7 +7059,7 @@
 
                if ($value) {
                        print "<style type=\"text/css\">";
-                       print $value;
+                       print str_replace("<br/>", "\n", $value);
                        print "</style>";
                }
 

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 1447634bf6a3ad55973d420d609b0efa8998d1ac..947dd5c50e9de3da44820004696965e906303380 100644 (file)
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -143,8 +143,10 @@
                if ($subop == "setpref") {
                        header("Content-Type: text/plain");
 
+                       $value = str_replace("\n", "<br/>", $_REQUEST['value']);
+
                        $key = db_escape_string($_REQUEST["key"]);
-                       $value = db_escape_string($_REQUEST["value"]);
+                       $value = db_escape_string($value);
 
                        set_pref($link, $key, $value);
 

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index d9de6ab53e9b22c770bd7d3ccb4da22b863eda2f..bc206be076aa1e79fa146cf076bb19e0086e1982 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -796,6 +796,8 @@
 
                        $value = get_pref($link, "USER_STYLESHEET");
 
+                       $value = str_replace("<br/>", "\n", $value);
+
                        print T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "tt-rss.css");
 
                        print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";