Version 5.0.6
This commit is contained in:
1 parent
a3a4a9ccbd
commit
b89858b2ff
1214 files changed
+92828
-14859
No files matched your search
@@ -275,13 +275,13 @@ abstract class AdminNotification extends ActiveRecord
|
||||
{
|
||||
if( Application::appIsEnabled( $notification['app'] ) )
|
||||
{
|
||||
$app = Application::load( $notification['app'] );
|
||||
if( array_key_exists( $notification['ext'], $app->extensions( $app, 'AdminNotifications', false ) ) AND class_exists( 'IPS\\' . $notification['app'] . '\extensions\core\AdminNotifications\\' . IPS::mb_ucfirst( $notification['ext'] ) ) )
|
||||
try
|
||||
{
|
||||
$class = Application::getExtensionClass( $notification['app'], 'AdminNotifications', IPS::mb_ucfirst( $notification['ext'] ) );
|
||||
$notificationObject = static::constructFromData( $notification );
|
||||
$notifications[$notificationObject->id] = $notificationObject;
|
||||
}
|
||||
else
|
||||
catch( OutOfRangeException )
|
||||
{
|
||||
/* Remove orphan entry */
|
||||
Db::i()->delete( 'core_acp_notifications', ['id=?', $notification['id']] );
|
||||
@@ -347,14 +347,18 @@ abstract class AdminNotification extends ActiveRecord
|
||||
}
|
||||
else
|
||||
{
|
||||
$classname = 'IPS\\' . $app . '\extensions\core\AdminNotifications\\' . IPS::mb_ucfirst( $extension );
|
||||
$notification = new $classname;
|
||||
$notification->app = $app;
|
||||
$notification->ext = $extension;
|
||||
$notification->extra = $extra;
|
||||
$notification->additionalData = $additionalData;
|
||||
try
|
||||
{
|
||||
$classname = Application::getExtensionClass( $app, 'AdminNotifications', IPS::mb_ucfirst( $extension ) );
|
||||
$notification = new $classname;
|
||||
$notification->app = $app;
|
||||
$notification->ext = $extension;
|
||||
$notification->extra = $extra;
|
||||
$notification->additionalData = $additionalData;
|
||||
|
||||
unset( Store::i()->acpNotifications );
|
||||
unset( Store::i()->acpNotifications );
|
||||
}
|
||||
catch( OutOfRangeException ){}
|
||||
}
|
||||
|
||||
/* Is this a new notification? */
|
||||
@@ -436,7 +440,7 @@ abstract class AdminNotification extends ActiveRecord
|
||||
*/
|
||||
public static function constructFromData( array $data, bool $updateMultitonStoreIfExists = TRUE ): ActiveRecord
|
||||
{
|
||||
$classname = 'IPS\\' . $data['app'] . '\extensions\core\AdminNotifications\\' . IPS::mb_ucfirst( $data['ext'] );
|
||||
$classname = Application::getExtensionClass( $data['app'], 'AdminNotifications', IPS::mb_ucfirst( $data['ext'] ) );
|
||||
|
||||
/* Initiate an object */
|
||||
$obj = new $classname;
|
||||
|
||||
Reference in new issue
Block a user