Merge branch 'notice-location' into 'nightly'

Re-enable notice locations Removed a stray 'return' statement. See merge request !125
2016-06-17 16:28:56 -04:00 · 2016-06-17 16:28:56 -04:00 · d66b495ba8
commit d66b495ba8
parent cb8bf360c4 d02c75d019
1 changed files with 0 additions and 1 deletions
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@ -395,7 +395,6 @@ class NoticeListItem extends Widget
     */
    function showNoticeLocation()
    {
-        return;
        try {
            $location = Notice_location::locFromStored($this->notice);
        } catch (NoResultException $e) {