harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.12RC'

Browse Source
This commit is contained in:
redmatrix
2016-08-22 20:05:25 -07:00
parent fbb357ac47 1a506ad49c
commit b89c869e7c
121 changed files with 29761 additions and 27620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/widgets.php
View File

@@ -595,7 +595,7 @@ function widget_settings_menu($arr) {
}
// IF can go away when UNO export and import is fully functional
if(! UNO) {
if(get_config('system','server_role') !== 'basic') {
$tabs[] = array(
'label' => t('Export channel'),
'url' => z_root() . '/uexport',
@@ -609,7 +609,7 @@ function widget_settings_menu($arr) {
'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
);
if(! UNO) {
if(get_config('system','server_role') !== 'basic') {
$tabs[] = array(
'label' => t('Guest Access Tokens'),
'url' => z_root() . '/settings/tokens',
@@ -779,6 +779,20 @@ function widget_design_tools($arr) {
return design_tools();
}
function widget_website_import_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.
if(App::$profile['profile_uid'])
if((App::$profile['profile_uid'] != local_channel()) && (! App::$is_sys))
return '';
if(! local_channel())
return '';
return website_import_tools();
}
function widget_findpeople($arr) {
return findpeople_widget();