diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
| commit | e9462ba14529b7172ba5a21e7985d24de91faa37 (patch) | |
| tree | c2270ca2975f6683a361c5959894b6bbc954475d /include/widgets.php | |
| parent | 2b9322fc7d879fecbe334083bbd028538c985c54 (diff) | |
| parent | b775a1aa0e36a74f0f937d85f458fd12af18a264 (diff) | |
| download | volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.gz volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.bz2 volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.zip | |
resolve merge conflict
Diffstat (limited to 'include/widgets.php')
| -rw-r--r-- | include/widgets.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/widgets.php b/include/widgets.php index 765cb4d42..9429df249 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -779,7 +779,7 @@ function widget_design_tools($arr) { return design_tools(); } -function widget_website_import_tools($arr) { +function widget_website_portation_tools($arr) { // mod menu doesn't load a profile. For any modules which load a profile, check it. // otherwise local_channel() is sufficient for permissions. @@ -791,7 +791,7 @@ function widget_website_import_tools($arr) { if(! local_channel()) return ''; - return website_import_tools(); + return website_portation_tools(); } function widget_findpeople($arr) { |