Version 4.6.0
This commit is contained in:
1 parent
f79dcf067a
commit
517a5e1f70
2036 files changed
+110041
-26162
No files matched your search
@@ -164,17 +164,17 @@ abstract class _Library
|
||||
$_SESSION['convertCountRows'][ $masterAppId ] = array();
|
||||
}
|
||||
|
||||
if ( !isset( $_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->sw ] ) )
|
||||
if ( !isset( $_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->app_id ] ) )
|
||||
{
|
||||
$_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->sw ] = array();
|
||||
$_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->app_id ] = array();
|
||||
}
|
||||
|
||||
if ( !isset( $_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->sw ][ $method ] ) )
|
||||
if ( !isset( $_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->app_id ][ $method ] ) )
|
||||
{
|
||||
$_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->sw ][ $method ] = $this->software->countRows( static::$action, $canConvert[ $method ]['where'], true );
|
||||
$_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->app_id ][ $method ] = $this->software->countRows( static::$action, $canConvert[ $method ]['where'], true );
|
||||
}
|
||||
|
||||
$total = $_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->sw ][ $method ];
|
||||
$total = $_SESSION['convertCountRows'][ $masterAppId ][ $this->software->app->app_id ][ $method ];
|
||||
|
||||
if ( $data >= $total )
|
||||
{
|
||||
@@ -363,13 +363,13 @@ abstract class _Library
|
||||
foreach( $applicationsToCheck as $app )
|
||||
{
|
||||
/* Check app has cached data */
|
||||
if( !isset( $_SESSION['convertCountRows'][ $masterAppId ][ $app->sw ] ) )
|
||||
if( !isset( $_SESSION['convertCountRows'][ $masterAppId ][ $app->app_id ] ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$totalSoFar += array_sum(
|
||||
array_filter( $_SESSION['convertCountRows'][ $masterAppId ][ $app->sw ], function( $key ) use( $app ) {
|
||||
array_filter( $_SESSION['convertCountRows'][ $masterAppId ][ $app->app_id ], function( $key ) use( $app ) {
|
||||
return ( \in_array( $key, $app->_session['completed'] ) );
|
||||
}, ARRAY_FILTER_USE_KEY )
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user