Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/controllers/albums.php

1 files changed, 8 insertions, 0 deletions

diff --git a/modules/exif/helpers/exif_event.php b/modules/exif/helpers/exif_event.php
index 826ec959..81ac5f44 100644
--- a/modules/exif/helpers/exif_event.php
+++ b/modules/exif/helpers/exif_event.php
@@ -18,6 +18,14 @@
  * 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);