Version 5.0.0 beta 3
This commit is contained in:
1 parent
f61b0da85d
commit
e86153356a
108 files changed
+2927
-1573
No files matched your search
@@ -36,6 +36,7 @@ use OutOfRangeException;
|
||||
use ParseError;
|
||||
use UnderflowException;
|
||||
use UnexpectedValueException;
|
||||
use function array_keys;
|
||||
use function array_merge;
|
||||
use function count;
|
||||
use function defined;
|
||||
@@ -138,7 +139,7 @@ class CustomTemplate extends Model
|
||||
*/
|
||||
public static function all(): ActiveRecordIterator
|
||||
{
|
||||
return new ActiveRecordIterator( Db::i()->select( '*', static::$databaseTable, Db::i()->in( 'template_app', array_keys( Application::enabledApplications() ) ), static::$databasePrefix . static::$databaseColumnOrder ), 'IPS\Theme\CustomTemplate' );
|
||||
return new ActiveRecordIterator( Db::i()->select( '*', static::$databaseTable, null, static::$databasePrefix . static::$databaseColumnOrder ), 'IPS\Theme\CustomTemplate' );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -305,6 +306,12 @@ class CustomTemplate extends Model
|
||||
$organised = [];
|
||||
foreach( static::all() as $template )
|
||||
{
|
||||
/* Only use templates that are enabled */
|
||||
if ( $template->app and ! in_array( $template->app, array_keys( Application::enabledApplications() ) ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( ! $template->hookpoint )
|
||||
{
|
||||
if ( $template->key )
|
||||
|
||||
Reference in new issue
Block a user