diff options
author | Andrew Dolgov <[email protected]> | 2010-12-28 09:11:49 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-12-28 09:11:49 +0300 |
commit | 5823f9fbabb610a487b5d50a1a81b33445cfb881 (patch) | |
tree | 168f83cee9034fcde79dbb41b9cb1c71b9443471 | |
parent | 947daa10a1a86d4dad738ae789cc2fc8ec28d5d6 (diff) |
fix USER_STYLESHEET for mysql (was broken because of CR escaping
-rw-r--r-- | functions.php | 2 | ||||
-rw-r--r-- | modules/backend-rpc.php | 4 | ||||
-rw-r--r-- | modules/popup-dialog.php | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/functions.php b/functions.php index 3928b2a34..b2694f7ec 100644 --- 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 1447634bf..947dd5c50 100644 --- 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 d9de6ab53..bc206be07 100644 --- 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\">"; |