Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 9 insertions, 8 deletions

diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php
index 009d8810..399053d8 100644
--- a/modules/akismet/views/admin_akismet.html.php
+++ b/modules/akismet/views/admin_akismet.html.php
@@ -1,17 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminAkismet">
-  <h1> <?= t("Akismet Spam Filtering") ?> </h1>
+<div id="g-admin-akismet" class="g-block">
+  <h1> <?= t("Akismet spam filtering") ?> </h1>
   <p>
   <?= t("Akismet is a free, automated spam filtering service.  In order to use it, you need to sign up for a <a href=\"%api_key_url\">Wordpress.com API Key</a>, which is also free.  Your comments will be automatically relayed to <a href=\"%akismet_url\">Akismet.com</a> where they'll be scanned for spam.  Spam messages will be flagged accordingly and hidden from your vistors until you approve or delete them.",
         array("api_key_url" => "http://wordpress.com/api-keys",
               "akismet_url" => "http://akismet.com")) ?>
   </p>
+  <div class="g-block-content">
+    <? if ($valid_key): ?>
+    <div class="g-module-status g-success">
+      <?= t("Your API key is valid.  Your comments will be filtered!") ?>
+    </div>
+    <? endif ?>
 
-  <? if ($valid_key): ?>
-  <div class="gModuleStatus gSuccess">
-    <?= t("Your API Key is valid.  Your comments will be filtered!") ?>
+    <?= $form ?>
   </div>
-  <? endif ?>
-
-  <?= $form ?>
 </div>