diff options
author | fabrixxm <fabrix.xm@gmail.com> | 2011-07-05 07:11:57 +0200 |
---|---|---|
committer | fabrixxm <fabrix.xm@gmail.com> | 2011-07-05 07:11:57 +0200 |
commit | 4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8 (patch) | |
tree | 84184bd3aa80c896b8dceaf5a017297c7267f2cb /mod/friendika.php | |
parent | cfd59f6ac8848c19a0c451c378d2b770cafcbef0 (diff) | |
parent | 2359783b9f6c0ec754c641453026712cf22e7cb6 (diff) | |
download | volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.tar.gz volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.tar.bz2 volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.zip |
Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy
Diffstat (limited to 'mod/friendika.php')
-rw-r--r-- | mod/friendika.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/friendika.php b/mod/friendika.php index 7762bfbb5..8c034c4ac 100644 --- a/mod/friendika.php +++ b/mod/friendika.php @@ -21,7 +21,7 @@ function friendika_init(&$a) { 'register_policy' => $register_policy[$a->config['register_policy']], 'admin' => $admin, 'site_name' => $a->config['sitename'], - + 'info' => ((x($a->config,'info')) ? $a->config['info'] : '') ); echo json_encode($data); |