aboutsummaryrefslogtreecommitdiffstats
path: root/mod/admin.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-13 18:07:49 -0800
committerfriendica <info@friendica.com>2015-01-13 18:07:49 -0800
commit111bbe65d9f671f598b68da63d74555d68973358 (patch)
treebb081ac8acd5a3245e7022f64589bbf5d3c0180b /mod/admin.php
parente528483d8150b1495e96de5309ed383a5fd6e09b (diff)
parent47a2668b30de34f1f08983ba485a630a89a9dd1e (diff)
downloadvolse-hubzilla-111bbe65d9f671f598b68da63d74555d68973358.tar.gz
volse-hubzilla-111bbe65d9f671f598b68da63d74555d68973358.tar.bz2
volse-hubzilla-111bbe65d9f671f598b68da63d74555d68973358.zip
Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging
Conflicts: mod/profiles.php
Diffstat (limited to 'mod/admin.php')
-rw-r--r--mod/admin.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/mod/admin.php b/mod/admin.php
index 74a373738..1503bf18e 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -288,6 +288,8 @@ function admin_page_site_post(&$a){
del_config('system','admininfo');
}
else {
+ require_once('include/text.php');
+ linkify_tags($a, $admininfo, local_user());
set_config('system','admininfo', $admininfo);
}
set_config('system','language', $language);