aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-06 19:25:01 -0800
committerfriendica <info@friendica.com>2013-01-06 19:25:01 -0800
commit3fc6df1000ea064e8f5ee6e066a79460d90b25cb (patch)
treebca9be1c79ae23bc3bde2c31e4254be5a991a30c /include/conversation.php
parenta9aa74a8074fd2eec58dd5927313fcef4fd5d930 (diff)
parentc94c500cdcfdc94427d7f7e2509e9af9ee0d78ae (diff)
downloadvolse-hubzilla-3fc6df1000ea064e8f5ee6e066a79460d90b25cb.tar.gz
volse-hubzilla-3fc6df1000ea064e8f5ee6e066a79460d90b25cb.tar.bz2
volse-hubzilla-3fc6df1000ea064e8f5ee6e066a79460d90b25cb.zip
Merge pull request #13 from fermionic/20130105-smarty3
implement smarty3
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index ba92c1a57..56bcef559 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -344,7 +344,6 @@ function visible_activity($item) {
return true;
}
-
/**
* "Render" a conversation or list of items for HTML display.
* There are two major forms of display:
@@ -886,7 +885,7 @@ function status_editor($a,$x,$popup=false) {
$o = '';
- $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
+ $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : '');
$plaintext = true;
if(feature_enabled(local_user(),'richtext'))