X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=c7681a4d58cb2485a8e34ac623d89440a4a36404;hb=810843763dcde2a004f992dc23c928a45ab8184b;hp=fc5e79294f261bfbe1942b42a7daad69f46f3aeb;hpb=22752039178e3d61844e6c1dafc8f1abd06b09cc;p=friendica.git
diff --git a/include/text.php b/include/text.php
index fc5e79294f..c7681a4d58 100644
--- a/include/text.php
+++ b/include/text.php
@@ -22,7 +22,7 @@ function replace_macros($s,$r) {
$a = get_app();
// pass $baseurl to all templates
- $r['$baseurl'] = z_root();
+ $r['$baseurl'] = $a->get_baseurl();
$t = $a->template_engine();
@@ -829,35 +829,6 @@ function qp($s) {
return str_replace ("%","=",rawurlencode($s));
}}
-
-
-if(! function_exists('get_mentions')) {
-/**
- * @param array $item
- * @return string html for mentions #FIXME: remove html
- */
-function get_mentions($item) {
- $o = '';
- if(! strlen($item['tag']))
- return $o;
-
- $arr = explode(',',$item['tag']);
- foreach($arr as $x) {
- $matches = null;
- if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
- $o .= "\t\t" . '' . "\r\n";
- $o .= "\t\t" . '' . "\r\n";
- }
- }
-
- if (!$item['private']) {
- $o .= "\t\t".''."\r\n";
- $o .= "\t\t".''."\r\n";
- }
-
- return $o;
-}}
-
if(! function_exists('contact_block')) {
/**
* Get html for contact block.
@@ -1533,7 +1504,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$pos = strpos($s, $spoilersearch);
$rnd = random_string(8);
- $spoilerreplace = '
'.sprintf(t('Click to open/close')).''.
+ $spoilerreplace = '
'.sprintf(t('Click to open/close')).''.
'