diff options
author | Thomas Willingham <founder@kakste.com> | 2013-12-22 20:45:31 +0000 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2013-12-22 20:45:31 +0000 |
commit | 3502a2e86b1d4924fea3b0eac6c3ce499eea2f16 (patch) | |
tree | 823970af414e5c17ca660fc9cb8d5e6fefa8356d /include/text.php | |
parent | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (diff) | |
parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
download | volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.gz volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.bz2 volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/text.php')
-rwxr-xr-x | include/text.php | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/include/text.php b/include/text.php index f808fb0a0..b3154d23e 100755 --- a/include/text.php +++ b/include/text.php @@ -1889,18 +1889,17 @@ function json_decode_plus($s) { function design_tools() { -$channel = get_app()->get_channel(); -$who = $channel['channel_address']; - -return replace_macros(get_markup_template('design_tools.tpl'), array( - '$title' => t('Design'), - '$who' => $who, - '$blocks' => t('Blocks'), - '$menus' => t('Menus'), - '$layout' => t('Layouts'), - '$pages' => t('Pages') - )); - + $channel = get_app()->get_channel(); + $who = $channel['channel_address']; + + return replace_macros(get_markup_template('design_tools.tpl'), array( + '$title' => t('Design'), + '$who' => $who, + '$blocks' => t('Blocks'), + '$menus' => t('Menus'), + '$layout' => t('Layouts'), + '$pages' => t('Pages') + )); } /* case insensitive in_array() */ |