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
@@ -108,8 +108,6 @@ abstract class Standard extends Dispatcher
|
||||
Output::i()->jsVars['ipb_url_filter_option'] = Settings::i()->ipb_url_filter_option;
|
||||
Output::i()->jsVars['url_filter_any_action'] = Settings::i()->url_filter_any_action;
|
||||
Output::i()->jsVars['bypass_profanity'] = intval( Member::loggedIn()->group['g_bypass_badwords'] );
|
||||
Output::i()->jsVars['emoji_style'] = ( Settings::i()->getFromConfGlobal('sql_utf8mb4') === TRUE ) ? Settings::i()->emoji_style : 'disabled';
|
||||
Output::i()->jsVars['emoji_shortcodes'] = (bool) Settings::i()->emoji_shortcodes;
|
||||
Output::i()->jsVars['emoji_cache'] = (int) Settings::i()->emoji_cache;
|
||||
Output::i()->jsVars['image_jpg_quality'] = (int) Settings::i()->image_jpg_quality ?: 85;
|
||||
Output::i()->jsVars['cloud2'] = (bool) CIC2;
|
||||
@@ -327,6 +325,11 @@ abstract class Standard extends Dispatcher
|
||||
*/
|
||||
public bool $destruct = true;
|
||||
|
||||
/**
|
||||
* @brief Flag to check if we are in the destructor
|
||||
*/
|
||||
public bool $inDestructor = false;
|
||||
|
||||
/**
|
||||
* Destructor
|
||||
* Runs tasks
|
||||
@@ -343,6 +346,7 @@ abstract class Standard extends Dispatcher
|
||||
|
||||
if ( $this->runTasks and Settings::i()->task_use_cron == 'normal' and !Request::i()->isAjax() )
|
||||
{
|
||||
$this->inDestructor = true;
|
||||
try
|
||||
{
|
||||
$task = Task::queued();
|
||||
|
||||
Reference in new issue
Block a user