Version 5.0.14
This commit is contained in:
1 parent
5efe744c5f
commit
dbd774b30c
364 files changed
+7048
-1377
No files matched your search
@@ -356,11 +356,21 @@ class Admin extends Standard
|
||||
/* If we set a do=value in the menu, add that to the list of menu checks */
|
||||
if( isset( $item['do'] ) and $item['do'] )
|
||||
{
|
||||
if( isset( $item['menu_checks']['do'] ) and !is_array( $item['menu_checks']['do'] ) )
|
||||
/* Sometimes we cheat and have extra query string parameters in here, so make sure we only get what we need */
|
||||
$amp = strpos( $item['do'], '&' );
|
||||
if( $amp !== false )
|
||||
{
|
||||
$item['menu_checks']['do'] = array( $item['menu_checks']['do'] );
|
||||
$do = substr( $item['do'], 0, $amp );
|
||||
}
|
||||
|
||||
if( !empty( $do ) )
|
||||
{
|
||||
if( isset( $item['menu_checks']['do'] ) and !is_array( $item['menu_checks']['do'] ) )
|
||||
{
|
||||
$item['menu_checks']['do'] = array( $item['menu_checks']['do'] );
|
||||
}
|
||||
$item['menu_checks']['do'][] = $do;
|
||||
}
|
||||
$item['menu_checks']['do'][] = $item['do'];
|
||||
}
|
||||
|
||||
if( isset( $item['menu_checks'] ) AND is_array( $item['menu_checks'] ) )
|
||||
@@ -523,14 +533,17 @@ class Admin extends Standard
|
||||
if ( \IPS\IN_DEV )
|
||||
{
|
||||
$currentApp = Request::i()->appKey ?? 'core';
|
||||
foreach ( $this->menu['tabs']['developer'] as $module => $controllers )
|
||||
if ( isset( $this->menu['tabs']['developer'] ) )
|
||||
{
|
||||
foreach ( $controllers as $key => $url )
|
||||
foreach ( $this->menu['tabs']['developer'] as $module => $controllers )
|
||||
{
|
||||
parse_str( $url, $params );
|
||||
$params['module'] = 'developer';
|
||||
$params['appKey'] = $currentApp;
|
||||
$this->menu['tabs']['developer'][$module][$key] = http_build_query( $params );
|
||||
foreach ( $controllers as $key => $url )
|
||||
{
|
||||
parse_str( $url, $params );
|
||||
$params['module'] = 'developer';
|
||||
$params['appKey'] = $currentApp;
|
||||
$this->menu['tabs']['developer'][ $module ][ $key ] = http_build_query( $params );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user