Did a git pull, but had to manually merge a conflict.

1 files changed, 3 insertions, 1 deletions

diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index a6536361..98fa0d4f 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $("#g-add-tag-form").ready(function() {
-    var url = $("#g-tag-cloud").attr("ref") + "/autocomplete";
+    var url = $("#g-tag-cloud-autocomplete-url").attr("href");
     $("#g-add-tag-form input:text").autocomplete(
       url, {
         max: 30,
@@ -23,6 +23,8 @@
   });
 </script>
 <div id="g-tag-cloud">
+   <a id="g-tag-cloud-autocomplete-url" style="display: none"
+      href="<?= url::site("tags/autocomplete") ?>"></a>
   <?= $cloud ?>
 </div>
 <?= $form ?>