From 5501558fa7a764459c2ac0fc2e8233243ca429ff Mon Sep 17 00:00:00 2001 From: Waseem Daher Date: Mon, 7 Jan 2013 17:33:36 -0500 Subject: [PATCH] Only request background color for stream messages. subs.get_color is expecting a string, and so if you do this on a PM, it breaks. (imported from commit acf6d51b84d7bbbe643466f1f72f90a8f6cf16f6) --- zephyr/static/js/zephyr.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js index 4cb3d1d46e..f70d3cbceb 100644 --- a/zephyr/static/js/zephyr.js +++ b/zephyr/static/js/zephyr.js @@ -332,7 +332,9 @@ function add_to_table(messages, table_name, filter_function, where, allow_collap message.stamp = ui.get_gravatar_stamp(); } - message.background_color = subs.get_color(message.display_recipient); + if (message.is_stream) { + message.background_color = subs.get_color(message.display_recipient); + } messages_to_render.push(message); prev = message;