diff options
| author | friendica <info@friendica.com> | 2015-01-13 18:07:49 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-13 18:07:49 -0800 |
| commit | 111bbe65d9f671f598b68da63d74555d68973358 (patch) | |
| tree | bb081ac8acd5a3245e7022f64589bbf5d3c0180b /mod/siteinfo.php | |
| parent | e528483d8150b1495e96de5309ed383a5fd6e09b (diff) | |
| parent | 47a2668b30de34f1f08983ba485a630a89a9dd1e (diff) | |
| download | volse-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/siteinfo.php')
| -rw-r--r-- | mod/siteinfo.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 01804e62a..1f3cd4479 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -126,7 +126,8 @@ function siteinfo_content(&$a) { else $plugins_text = t('No installed plugins/addons/apps'); - $admininfo = bbcode(get_config('system','admininfo')); + $txt = get_config('system','admininfo'); + $admininfo = bbcode($txt); if(file_exists('doc/site_donate.html')) $donate .= file_get_contents('doc/site_donate.html'); |