diff options
| author | M. Dent <dentm42@gmail.com> | 2019-03-15 02:51:51 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-03-15 02:51:51 +0100 |
| commit | a22406c9f83b61368dc108dbab1e9ce254ebedfa (patch) | |
| tree | 29feeb54f4de964f1083349fc4bbbd454cf18f3e /include/text.php | |
| parent | 8769fa0156c470b533bdf23a0df5beb20bc1a4bd (diff) | |
| parent | ebc3666c6f9a14db7efba849c4837d45688f030f (diff) | |
| download | volse-hubzilla-a22406c9f83b61368dc108dbab1e9ce254ebedfa.tar.gz volse-hubzilla-a22406c9f83b61368dc108dbab1e9ce254ebedfa.tar.bz2 volse-hubzilla-a22406c9f83b61368dc108dbab1e9ce254ebedfa.zip | |
Merge branch 'cleanup' into 'dev'
Cleanup and fixes
See merge request hubzilla/core!1554
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/include/text.php b/include/text.php index ec3eb7b10..41603f6e4 100644 --- a/include/text.php +++ b/include/text.php @@ -20,7 +20,7 @@ define('RANDOM_STRING_TEXT', 0x01 ); /** * @brief This is our template processor. * - * @param string|SmartyEngine $s the string requiring macro substitution, + * @param string SmartyEngine $s the string requiring macro substitution, * or an instance of SmartyEngine * @param array $r key value pairs (search => replace) * @@ -2550,15 +2550,6 @@ function design_tools() { */ function website_portation_tools() { - $channel = App::get_channel(); - $sys = false; - - if(App::$is_sys && is_site_admin()) { - require_once('include/channel.php'); - $channel = get_sys_channel(); - $sys = true; - } - return replace_macros(get_markup_template('website_portation_tools.tpl'), [ '$title' => t('Import'), '$import_label' => t('Import website...'), @@ -2726,7 +2717,6 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) $name = substr($tag,(($exclusive) ? 2 : 1)); $newname = $name; // make a copy that we can mess with - $tagcid = 0; $r = null; @@ -2785,14 +2775,9 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) } - - - - $fn_results = []; $access_tag = EMPTY_STR; - // $r is set if we found something if($r) { |