Version 5.0.6
This commit is contained in:
1 parent
a3a4a9ccbd
commit
b89858b2ff
1214 files changed
+92828
-14859
No files matched your search
@@ -119,32 +119,48 @@ class Upgrade
|
||||
$rows = iterator_to_array(
|
||||
Db::i()->select( '*', 'core_approval_queue' )
|
||||
);
|
||||
$invalidClasses = [];
|
||||
|
||||
foreach( $rows as $row )
|
||||
{
|
||||
$containerId = null;
|
||||
$class = $row['approval_content_class'];
|
||||
if( is_subclass_of( $class, 'IPS\Content\Comment' ) )
|
||||
if( class_exists( $row['approval_content_class'] ) )
|
||||
{
|
||||
$itemClass = $class::$itemClass;
|
||||
if( isset( $itemClass::$databaseColumnMap['container'] ) )
|
||||
if( is_subclass_of( $class, 'IPS\Content\Comment' ) )
|
||||
{
|
||||
$itemClass = $class::$itemClass;
|
||||
if ( !class_exists( $itemClass ) )
|
||||
{
|
||||
/* Remove both, if the item class doesn't exist. */
|
||||
$invalidClasses[] = $itemClass;
|
||||
$invalidClasses[] = $row['approval_content_class'];
|
||||
continue;
|
||||
}
|
||||
|
||||
if( isset( $itemClass::$databaseColumnMap['container'] ) )
|
||||
{
|
||||
try
|
||||
{
|
||||
$containerId = Db::i()->select( $itemClass::$databasePrefix . $itemClass::$databaseColumnMap['container'], $class::$databaseTable, array( $class::$databasePrefix . $class::$databaseColumnId . '=?', $row['approval_content_id'] ) )
|
||||
->join( $itemClass::$databaseTable, $class::$databaseTable . '.' . $class::$databasePrefix . $class::$databaseColumnMap['item'] . '=' . $itemClass::$databaseTable . '.' . $itemClass::$databasePrefix . $itemClass::$databaseColumnId )
|
||||
->first();
|
||||
}
|
||||
catch( UnderflowException ){}
|
||||
}
|
||||
}
|
||||
elseif( isset( $class::$databaseColumnMap['container'] ) )
|
||||
{
|
||||
try
|
||||
{
|
||||
$containerId = Db::i()->select( $itemClass::$databasePrefix . $itemClass::$databaseColumnMap['container'], $class::$databaseTable, array( $class::$databasePrefix . $class::$databaseColumnId . '=?', $row['approval_content_id'] ) )
|
||||
->join( $itemClass::$databaseTable, $class::$databaseTable . '.' . $class::$databasePrefix . $class::$databaseColumnMap['item'] . '=' . $itemClass::$databaseTable . '.' . $itemClass::$databasePrefix . $itemClass::$databaseColumnId )
|
||||
->first();
|
||||
$containerId = Db::i()->select( $class::$databasePrefix . $class::$databaseColumnMap['container'], $class::$databaseTable, array( $class::$databasePrefix . $class::$databaseColumnId . '=?', $row['approval_content_id'] ) )->first();
|
||||
}
|
||||
catch( UnderflowException ){}
|
||||
}
|
||||
}
|
||||
elseif( isset( $class::$databaseColumnMap['container'] ) )
|
||||
else if( !isset( $invalidClasses[$class] ) )
|
||||
{
|
||||
try
|
||||
{
|
||||
$containerId = Db::i()->select( $class::$databasePrefix . $class::$databaseColumnMap['container'], $class::$databaseTable, array( $class::$databasePrefix . $class::$databaseColumnId . '=?', $row['approval_content_id'] ) )->first();
|
||||
}
|
||||
catch( UnderflowException ){}
|
||||
$invalidClasses[] = $row['approval_content_class'];
|
||||
}
|
||||
|
||||
if( $containerId )
|
||||
@@ -153,6 +169,11 @@ class Upgrade
|
||||
}
|
||||
}
|
||||
|
||||
if( count( $invalidClasses ) > 0 )
|
||||
{
|
||||
Db::i()->delete( 'core_approval_queue', Db::i()->in('approval_content_class', $invalidClasses ) );
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user