diff options
| author | czaks <marcin@6irc.net> | 2013-07-31 02:30:44 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-31 02:30:44 -0400 |
| commit | 96bcf5dd1e8e09bce46c80291a24562d64ebc8dc (patch) | |
| tree | 3721653471b6586c6fb7c09d4100810c6b419faa /templates/mod/log.html | |
| parent | 793042ee6ccd2fd1770c68ed55bfb1f58f2bf185 (diff) | |
| parent | b22bcdecf9cce8b08c48283290173996b6c8abf2 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
inc/functions.php
inc/mod/pages.php
install.php
js/expand.js
mod.php
Diffstat (limited to 'templates/mod/log.html')
| -rw-r--r-- | templates/mod/log.html | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/templates/mod/log.html b/templates/mod/log.html index e75330b5..0aa3f110 100644 --- a/templates/mod/log.html +++ b/templates/mod/log.html @@ -18,7 +18,11 @@ {% endif %} </td> <td class="minimal"> - <a href="?/IP/{{ log.ip }}">{{ log.ip }}</a> + {% if mod|hasPermission(config.mod.show_ip_modlog) %} + <a href="?/IP/{{ log.ip }}">{{ log.ip }}</a> + {% else %} + <em>hidden</em> + {% endif %} </td> <td class="minimal"> <span title="{{ log.time|date(config.post_date) }}">{{ log.time|ago }}</span> |
