Version 5.0.0 beta 10
This commit is contained in:
1 parent
56979f8ee8
commit
264eeb97e0
325 files changed
+6442
-1849
No files matched your search
@@ -825,12 +825,22 @@ class Club extends ActiveRecord implements Embeddable
|
||||
if( $new and $this->approved )
|
||||
{
|
||||
Webhook::fire( 'club_created', $this );
|
||||
|
||||
}
|
||||
else if( !$new AND isset( $this->changed['approved'] ) )
|
||||
{
|
||||
$this->onApprove();
|
||||
}
|
||||
|
||||
if( $new )
|
||||
{
|
||||
Event::fire( 'onCreate', $this );
|
||||
}
|
||||
else
|
||||
{
|
||||
Event::fire( 'onEdit', $this );
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -1821,6 +1831,8 @@ class Club extends ActiveRecord implements Embeddable
|
||||
}
|
||||
|
||||
$this->coverPhoto( FALSE )->delete();
|
||||
|
||||
Event::fire( 'onDelete', $this );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1833,7 +1845,7 @@ class Club extends ActiveRecord implements Embeddable
|
||||
{
|
||||
foreach( Db::i()->select( 'node_class', 'core_clubs_node_map', NULL, NULL, NULL, 'node_class' ) as $class )
|
||||
{
|
||||
if ( isset( $class::$contentItemClass ) )
|
||||
if ( class_exists( $class ) and isset( $class::$contentItemClass ) )
|
||||
{
|
||||
$contentItemClass = $class::$contentItemClass;
|
||||
|
||||
@@ -2296,6 +2308,7 @@ class Club extends ActiveRecord implements Embeddable
|
||||
public function onApprove() : void
|
||||
{
|
||||
Webhook::fire( 'club_created', $this );
|
||||
Event::fire( 'onCreate', $this );
|
||||
$this->owner->achievementAction( 'core', 'NewClub', $this );
|
||||
|
||||
try
|
||||
|
||||
@@ -254,10 +254,7 @@ class Group extends ActiveRecord
|
||||
/* Process each extension */
|
||||
foreach ( $extensions as $class )
|
||||
{
|
||||
if( method_exists( $class, 'cloneGroup' ) )
|
||||
{
|
||||
$class->cloneGroup( $oldGroup, $this );
|
||||
}
|
||||
$class->cloneGroup( $oldGroup, $this );
|
||||
}
|
||||
|
||||
Lang::saveCustom( 'core', "core_group_{$this->g_id}", iterator_to_array( Db::i()->select( '*', 'core_sys_lang_words', array( 'word_key=?', "core_group_{$oldId}" ) )->setKeyField('lang_id')->setValueField('word_custom') ) );
|
||||
@@ -413,10 +410,7 @@ class Group extends ActiveRecord
|
||||
/* Process each extension */
|
||||
foreach ( $extensions as $class )
|
||||
{
|
||||
if( method_exists( $class, 'delete' ) )
|
||||
{
|
||||
$class->delete( $this );
|
||||
}
|
||||
$class->delete( $this );
|
||||
}
|
||||
|
||||
parent::delete();
|
||||
@@ -440,7 +434,7 @@ class Group extends ActiveRecord
|
||||
|
||||
foreach ( $extensions as $class )
|
||||
{
|
||||
if( method_exists( $class, 'canDelete' ) AND !$class->canDelete( $this ) )
|
||||
if( !$class->canDelete( $this ) )
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -6644,6 +6644,10 @@ class Member extends ActiveRecord
|
||||
try
|
||||
{
|
||||
$lastLogin = Db::i()->select( 'MIN(upgrade_date)', 'core_upgrade_history', [ 'upgrade_app=? AND upgrade_version_id>=?', 'core', 106100 ] )->first();
|
||||
if( !$lastLogin )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch( \UnderflowException $e )
|
||||
{
|
||||
@@ -6778,10 +6782,7 @@ class Member extends ActiveRecord
|
||||
|
||||
foreach ( Application::allExtensions( 'core', 'IpAddresses', FALSE, 'core' ) as $key => $extension )
|
||||
{
|
||||
if( method_exists( $extension, 'pruneIpAddresses' ) )
|
||||
{
|
||||
$extension->pruneIpAddresses( $time );
|
||||
}
|
||||
$extension->pruneIpAddresses( $time );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -349,14 +349,11 @@ class ProfileStep extends Model
|
||||
{
|
||||
foreach( Application::allExtensions( 'core', 'ProfileSteps' ) AS $key => $extension )
|
||||
{
|
||||
if ( method_exists( $extension, 'actionMultipleChoice' ) )
|
||||
foreach( $extension::actions() AS $extensionAction => $lang )
|
||||
{
|
||||
foreach( $extension::actions() AS $extensionAction => $lang )
|
||||
if ( $action == $extensionAction )
|
||||
{
|
||||
if ( $action == $extensionAction )
|
||||
{
|
||||
return $extension::actionMultipleChoice( $action );
|
||||
}
|
||||
return $extension::actionMultipleChoice( $action );
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -491,12 +488,10 @@ class ProfileStep extends Model
|
||||
public function canComplete( Member $member = NULL ) : bool
|
||||
{
|
||||
$member = $member ?: Member::loggedIn();
|
||||
|
||||
/* @var ProfileStepsAbstract $extension */
|
||||
$extension = $this->extension;
|
||||
if( method_exists( $extension, 'canComplete' ) )
|
||||
{
|
||||
return $extension->canComplete( $member );
|
||||
}
|
||||
return TRUE;
|
||||
return $extension->canComplete( $member );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user