Version 5.0.13
This commit is contained in:
1 parent
b89858b2ff
commit
5efe744c5f
1407 files changed
+69690
-30177
No files matched your search
@@ -70,15 +70,15 @@ class Widget extends SystemWidget
|
||||
$uniqueIds = array();
|
||||
foreach( Db::i()->select( '*', 'cms_page_widget_areas' ) as $item )
|
||||
{
|
||||
if( $item['area_widgets'] )
|
||||
if( !empty( $item['area_tree'] ) )
|
||||
{
|
||||
$area = new Area( json_decode( $item['area_tree'], true ), $item['area_area'] );
|
||||
$widgets = $area->getAllWidgets();
|
||||
}
|
||||
elseif( $item['area_widgets'] )
|
||||
{
|
||||
$widgets = json_decode( $item['area_widgets'], TRUE );
|
||||
}
|
||||
else
|
||||
{
|
||||
$area = new Area( json_decode( $item['area_tree'], true ), $item['area_area'] );
|
||||
$widgets = $area->getAllWidgets();
|
||||
}
|
||||
|
||||
if( !is_array( $widgets ) or !count( $widgets ) )
|
||||
{
|
||||
@@ -99,15 +99,15 @@ class Widget extends SystemWidget
|
||||
|
||||
foreach( Db::i()->select( '*', 'core_widget_areas' ) as $item )
|
||||
{
|
||||
if( $item['widgets'] )
|
||||
if( !empty( $item['tree'] ) )
|
||||
{
|
||||
$area = new Area( json_decode( $item['tree'], true ), $item['area'] );
|
||||
$widgets = $area->getAllWidgets();
|
||||
}
|
||||
elseif( $item['widgets'] )
|
||||
{
|
||||
$widgets = json_decode( $item['widgets'], TRUE );
|
||||
}
|
||||
else
|
||||
{
|
||||
$area = new Area( $item['area'], json_decode( $item['tree'], true ) );
|
||||
$widgets = $area->getAllWidgets();
|
||||
}
|
||||
|
||||
if( !is_array( $widgets ) or !count( $widgets ) )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user