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

Conflicts:
	modules/gallery/controllers/rest.php

1 files changed, 1 insertions, 3 deletions

diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index 00b57360..8b887282 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -14,9 +14,7 @@
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
-          $.get($("#g-tag-cloud").attr("ref"), function(data, textStatus) {
-            $("#g-tag-cloud").html(data);
-          });
+          $("#g-tag-cloud").html(data.cloud);
         }
         $("#g-add-tag-form").resetForm();
       }