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

Conflicts:
	themes/default/js/ui.init.js

1 files changed, 1 insertions, 1 deletions

diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index cf8bebdd..453417dc 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-      show_full_size("<?= $theme->item()->file_url() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size("<?= $theme->item()->file_url() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
   });