diff options
| author | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
| commit | 21add7ffa87a5e622d18bdbb24c638c15bdb3800 (patch) | |
| tree | 6780aa6dbee71f18db64e44b012e789fc8197d4b /templates/inlinepage.tmpl | |
| parent | 3190e5cea75a43d38f58b8a45fbc87d5527d18f0 (diff) | |
| parent | 3032909090711c86c5056987043eeff5a1f6aec2 (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
debian/control
debian/copyright
doc/ikiwiki/pagespec.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'templates/inlinepage.tmpl')
| -rw-r--r-- | templates/inlinepage.tmpl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl index 984d33cef..3c0b93315 100644 --- a/templates/inlinepage.tmpl +++ b/templates/inlinepage.tmpl @@ -58,9 +58,13 @@ License: <TMPL_VAR LICENSE> <TMPL_IF NAME="EDITURL"> <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li> </TMPL_IF> +<TMPL_IF NAME="COMMENTSLINK"> +<li><TMPL_VAR COMMENTSLINK></li> +<TMPL_ELSE> <TMPL_IF NAME="DISCUSSIONLINK"> <li><TMPL_VAR DISCUSSIONLINK></li> </TMPL_IF> +</TMPL_IF> </ul> </div><!--.actions--> </TMPL_IF> |