Version 5.0.0 beta 2
This commit is contained in:
1 parent
15c7beabc5
commit
f61b0da85d
181 files changed
+3182
-1533
No files matched your search
@@ -129,13 +129,16 @@ class register extends Controller
|
||||
Output::i()->showOffline();
|
||||
}
|
||||
|
||||
if ( Member::loggedIn()->canAccessModule( Module::get( 'nexus', 'store' ) ) and ( Settings::i()->nexus_reg_force or !isset( Request::i()->noPurchase ) ) and Package::haveRegistrationProducts() )
|
||||
if( Application::appIsEnabled( 'nexus' ) )
|
||||
{
|
||||
Output::i()->redirect( Url::internal( 'app=nexus&module=store&controller=store&do=register', 'front', 'store' ) );
|
||||
}
|
||||
else if ( Member::loggedIn()->canAccessModule( Module::get( 'nexus', 'subscriptions' ) ) and ( Settings::i()->nexus_subs_register ) )
|
||||
{
|
||||
Output::i()->redirect( Url::internal( 'app=nexus&module=subscriptions&controller=subscriptions®ister=1', 'front', 'nexus_subscriptions' ) );
|
||||
if ( Member::loggedIn()->canAccessModule( Module::get( 'nexus', 'store' ) ) and ( Settings::i()->nexus_reg_force or !isset( Request::i()->noPurchase ) ) and Package::haveRegistrationProducts() )
|
||||
{
|
||||
Output::i()->redirect( Url::internal( 'app=nexus&module=store&controller=store&do=register', 'front', 'store' ) );
|
||||
}
|
||||
else if ( Member::loggedIn()->canAccessModule( Module::get( 'nexus', 'subscriptions' ) ) and ( Settings::i()->nexus_subs_register ) )
|
||||
{
|
||||
Output::i()->redirect( Url::internal( 'app=nexus&module=subscriptions&controller=subscriptions®ister=1', 'front', 'nexus_subscriptions' ) );
|
||||
}
|
||||
}
|
||||
|
||||
/* Set Session Location */
|
||||
|
||||
@@ -167,7 +167,7 @@ class themeeditor extends Controller
|
||||
break;
|
||||
}
|
||||
|
||||
if ( isset( Request::i()->{ 'delete__set__'. $type } ) )
|
||||
if ( isset( Request::i()->{ 'delete__set__'. $type } ) and isset( Theme::i()->logo[ $logoKey ]['url'] ) )
|
||||
{
|
||||
File::get( 'core_Theme', Theme::i()->logo[ $logoKey ]['url'] )->delete();
|
||||
$data['logo'][$logoKey] = [];
|
||||
@@ -291,6 +291,8 @@ class themeeditor extends Controller
|
||||
/* Flag our theme as no longer being edited */
|
||||
Theme::i()->editingFinish();
|
||||
|
||||
Output::i()->redirect( Url::internal( "" ) );
|
||||
$redirect = Request::i()->cookie['themeEditorLocation'] ?? Url::internal( '' );
|
||||
|
||||
Output::i()->redirect( $redirect );
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,6 @@ namespace IPS\core\modules\front\system;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
|
||||
use Exception;
|
||||
use IPS\Application;
|
||||
use IPS\cms\Blocks\Block;
|
||||
use IPS\cms\widgets\Blocks;
|
||||
@@ -178,6 +177,7 @@ class widgets extends Controller
|
||||
{
|
||||
$config = ( isset( $block['configuration'] ) AND !empty( $block['configuration'] ) ) ? $block['configuration'] : $widgetClass::getConfiguration( $key[3] );
|
||||
$widget = Widget::load( Application::load( $block['app'] ), $block['key'], $block['unique'], $config, null, Request::i()->orientation, Request::i()->layout ?: '' );
|
||||
$widget->neverCache = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user