Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 7 insertions, 1 deletions

diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index e9b402f6..af0e1ca4 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -19,13 +19,19 @@
  */
 class comment_theme_Core {
   static function head($theme) {
+    $theme->css("comment.css");
     $theme->script("comment.js");
     return "";
   }
 
+  static function admin_head($theme) {
+    $theme->css("comment.css");
+    return "";
+  }
+
   static function photo_bottom($theme) {
     $block = new Block;
-    $block->css_id = "gComments";
+    $block->css_id = "g-comments";
     $block->title = t("Comments");
     $block->anchor = "comments";