Version 4.7.6
This commit is contained in:
1 parent
8ba7d43898
commit
7b7404e741
1085 files changed
+30590
-7837
No files matched your search
+10
-2
@@ -29,7 +29,7 @@ class _Task extends \IPS\Patterns\ActiveRecord
|
||||
*/
|
||||
public static function runQueue()
|
||||
{
|
||||
$queueData = \IPS\Db::i()->select( '*', 'core_queue', array( 'app_enabled=?', 1 ), 'priority ASC, RAND()', 1 )->join( 'core_applications', "app=app_directory" )->first();
|
||||
$queueData = \IPS\Db::i()->select( '*', 'core_queue', array( 'app_enabled=?', 1 ), 'priority ASC, RAND()', 1, NULL, NULL, \IPS\Db::SELECT_FROM_WRITE_SERVER )->join( 'core_applications', "app=app_directory" )->first();
|
||||
$newOffset = 0;
|
||||
|
||||
$queueData['_originalOffset'] = $queueData['offset'];
|
||||
@@ -131,7 +131,15 @@ class _Task extends \IPS\Patterns\ActiveRecord
|
||||
if ( method_exists( $extensions[ $key ], 'preQueueData' ) )
|
||||
{
|
||||
$class = new $extensions[ $key ];
|
||||
$data = $class->preQueueData( $data );
|
||||
try
|
||||
{
|
||||
$data = $class->preQueueData( $data );
|
||||
}
|
||||
catch( \OutOfRangeException $e )
|
||||
{
|
||||
$data = NULL;
|
||||
}
|
||||
|
||||
if ( $data === NULL )
|
||||
{
|
||||
if ( method_exists( $class, 'postComplete' ) )
|
||||
|
||||
Reference in new issue
Block a user