diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-11-25 13:40:47 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-11-25 13:40:47 -0800 |
| commit | f50dbd992d6973caeaaa3139ddf5f908dd84ec79 (patch) | |
| tree | cbdb343de89306a4ed823dc5aa104a802f846dc4 /modules/tag/models | |
| parent | 2e420522ece22942a9b3b6ee413ca0e1dfa76148 (diff) | |
| parent | dc67cf64813361b34c366123f37d88ef6988fcc8 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/controllers/rest.php
Diffstat (limited to 'modules/tag/models')
| -rw-r--r-- | modules/tag/models/tag.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php index 49512daa..be020f5f 100644 --- a/modules/tag/models/tag.php +++ b/modules/tag/models/tag.php @@ -110,7 +110,7 @@ class Tag_Model extends ORM { * @param string $query the query string (eg "page=3") */ public function url($query=null) { - $url = url::site("tags/$this->id"); + $url = url::site("tags/show/$this->id"); if ($query) { $url .= "?$query"; } |