Version 5.0.0 beta 6
This commit is contained in:
1 parent
57d9db6ce2
commit
fa2a720105
115 files changed
+1823
-1147
No files matched your search
@@ -224,7 +224,7 @@ class menu extends Controller
|
||||
'title' => 'delete',
|
||||
'link' => Url::internal( "app=core&module=applications&controller=menu&do=remove&id={$item['id']}" )->csrf(),
|
||||
'icon' => 'times-circle',
|
||||
'data' => [ 'confirm' => '' ]
|
||||
'data' => ['delete' => ''],
|
||||
];
|
||||
|
||||
$icon = null;
|
||||
|
||||
@@ -389,10 +389,16 @@ class emoticons extends Controller
|
||||
{
|
||||
try
|
||||
{
|
||||
File::get( 'core_Emoticons', $emoticon['image'] )->delete();
|
||||
File::get( 'core_Emoticons', $emoticon['image_2x'] )->delete();
|
||||
if( $emoticon['image'] )
|
||||
{
|
||||
File::get( 'core_Emoticons', $emoticon['image'] )->delete();
|
||||
}
|
||||
if( $emoticon['image_2x'] )
|
||||
{
|
||||
File::get( 'core_Emoticons', $emoticon['image_2x'] )->delete();
|
||||
}
|
||||
}
|
||||
catch ( UnderflowException $e ) { }
|
||||
catch ( OutOfRangeException $e ) { }
|
||||
}
|
||||
|
||||
Db::i()->delete( 'core_emoticons', array( 'emo_set=?', $set ) );
|
||||
|
||||
@@ -769,7 +769,7 @@ class advertisements extends Controller
|
||||
|
||||
/* Any additional settings to save? */
|
||||
$additionalSettings = array(
|
||||
'ad_apps' => ( isset( $values['ad_apps'] ) AND $values['ad_apps'] != 0 ) ? array_keys( $values['ad_apps'] ) : 0
|
||||
'ad_apps' => ( isset( $values['ad_apps'] ) AND is_array( $values['ad_apps'] ) ) ? array_keys( $values['ad_apps'] ) : 0
|
||||
);
|
||||
|
||||
if( $values['ad_type'] == Advertisement::AD_EMAIL )
|
||||
|
||||
@@ -238,7 +238,7 @@ class seo extends Controller
|
||||
$value = $values['use_robotstxt_custom_editor'];
|
||||
}
|
||||
|
||||
$form->saveAsSettings( [ 'robots_txt' => $value ] );
|
||||
$form->saveAsSettings( [ 'robots_txt' => $value, 'seo_reduce_links' => $values['seo_reduce_links'] ] );
|
||||
|
||||
Session::i()->log( 'acplog__robotstxt_edited' );
|
||||
|
||||
|
||||
@@ -151,7 +151,7 @@ class membersactivity extends Controller
|
||||
/* And now build the table */
|
||||
$table = new Db( 'core_members', Request::i()->url()->setQueryString( array( 'postDateStart' => $startTime, 'postDateEnd' => $endTime, 'postGroups' => is_array( $groups ) ? implode( ',', $groups ) : NULL ) ), $where );
|
||||
|
||||
$table->include = array( 'name', 'email', 'member_posts', 'member_last_post', 'group_name', 'ip_address' );
|
||||
$table->include = array( 'name', 'email', 'member_last_post', 'group_name', 'ip_address' );
|
||||
$table->mainColumn = 'name';
|
||||
$table->langPrefix = 'activity_';
|
||||
$table->rowClasses = array( 'email' => array( 'ipsTable_wrap' ), 'group_name' => array( 'ipsTable_wrap' ) );
|
||||
|
||||
Reference in new issue
Block a user