Merge remote branch 'origin/master' into rawphoto

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index df81ae65..b415b42d 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -149,7 +149,7 @@ class tag_event_Core {
   static function info_block_get_metadata($block, $item) {
     $tags = array();
     foreach (tag::item_tags($item) as $tag) {
-      $tags[] = "<a href=\"" . url::site("tag/{$tag->name}") . "\">{$tag->name}</a>";
+      $tags[] = "<a href=\"{$tag->url()}\">{$tag->name}</a>";
     }
     if ($tags) {
       $info = $block->content->metadata;
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index 479a7da0..bd665667 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -132,7 +132,7 @@ class Tag_Model_Core extends ORM {
    * @param string $query the query string (eg "page=3")
    */
   public function url($query=null) {
-    $url = url::site("tag/{$this->id}/{$this->name}");
+    $url = url::site("tag/{$this->id}/" . urlencode($this->name));
     if ($query) {
       $url .= "?$query";
     }