aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-28 19:17:20 -0800
committerfriendica <info@friendica.com>2013-11-28 19:17:45 -0800
commitd1ab865ccf8a9200236e310c93ad56b8a7f93aad (patch)
treea3389b16a800ed7f513b020ba59e7f6f116e137d
parent94c293f2c6c8ff7d7a1a0f45ab9ab2ecfaa16372 (diff)
downloadvolse-hubzilla-d1ab865ccf8a9200236e310c93ad56b8a7f93aad.tar.gz
volse-hubzilla-d1ab865ccf8a9200236e310c93ad56b8a7f93aad.tar.bz2
volse-hubzilla-d1ab865ccf8a9200236e310c93ad56b8a7f93aad.zip
make the template processor (e.g. replace_macros) pluggable
-rwxr-xr-xinclude/text.php5
-rw-r--r--mod/connections.php2
2 files changed, 5 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php
index 54626a772..3d15a5c6b 100755
--- a/include/text.php
+++ b/include/text.php
@@ -15,8 +15,11 @@ require_once("include/friendica_smarty.php");
function replace_macros($s,$r) {
$a = get_app();
+ $arr = array('template' => $s, 'params' => $r);
+ call_hooks('replace_macros', $arr);
+
$t = $a->template_engine();
- $output = $t->replace_macros($s,$r);
+ $output = $t->replace_macros($arr['template'],$arr['params']);
return $output;
}
diff --git a/mod/connections.php b/mod/connections.php
index d7adf775b..39bef0209 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -464,7 +464,7 @@ function connections_content(&$a) {
'$cautious' => t('Cautious Sharing'),
'$follow' => t('Follow Only'),
'$permlbl' => t('Individual Permissions'),
- '$permnote' => t('Some permissions may be inherited from your <a href="settings">privacy settings</a>, which have higher priority. Changing those on this page will have no effect.'),
+ '$permnote' => t('Some permissions may be inherited from your channel <a href="settings">privacy settings</a>, which have higher priority. Changing those inherited settings on this page will have no effect.'),
'$advanced' => t('Advanced Permissions'),
'$quick' => t('Quick Links'),
'$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],