Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

2 files changed, 1 insertions, 9 deletions

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index 83540622..5ddd09d4 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -163,7 +163,7 @@ class exif_Core {
     list ($remaining) = exif::stats();
     if ($remaining) {
       site_status::warning(
-        t('Your Exif index needs to be updated.  <a href="%url" class="gDialogLink">Fix this now</a>',
+        t('Your Exif index needs to be updated.  <a href="%url" class="g-dialog-link">Fix this now</a>',
           array("url" => html::mark_clean(url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__")))),
         "exif_index_out_of_date");
     }
diff --git a/modules/exif/helpers/exif_event.php b/modules/exif/helpers/exif_event.php
index 81ac5f44..826ec959 100644
--- a/modules/exif/helpers/exif_event.php
+++ b/modules/exif/helpers/exif_event.php
@@ -18,14 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class exif_event_Core {
-  static function gallery_ready() {
-    if (!function_exists("gettext")) {
-      function gettext($message) {
-        return (string) t($message);
-      }
-    }
-  }
-
   static function item_created($item) {
     if (!$item->is_album()) {
       exif::extract($item);