joomla/Component-Builder
40
26
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

Made some changes to insure JCB is stable in PHP7, removed the related translations string from joomla_component view to speed up page load.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-03-12 00:36:14 +02:00
parent eb56fd3b48
commit e715fa1614
76 changed files with 3297 additions and 3407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
admin/models/library_files_folders_urls.php
View File

@@ -103,14 +103,6 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
$item->addfoldersfullpath = $addfoldersfullpath->toArray();
}
if (!empty($item->addurls))
{
// Convert the addurls field to an array.
$addurls = new Registry;
$addurls->loadString($item->addurls);
$item->addurls = $addurls->toArray();
}
if (!empty($item->addfilesfullpath))
{
// Convert the addfilesfullpath field to an array.
@@ -119,6 +111,14 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
$item->addfilesfullpath = $addfilesfullpath->toArray();
}
if (!empty($item->addfolders))
{
// Convert the addfolders field to an array.
$addfolders = new Registry;
$addfolders->loadString($item->addfolders);
$item->addfolders = $addfolders->toArray();
}
if (!empty($item->addfiles))
{
// Convert the addfiles field to an array.
@@ -127,12 +127,12 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
$item->addfiles = $addfiles->toArray();
}
if (!empty($item->addfolders))
if (!empty($item->addurls))
{
// Convert the addfolders field to an array.
$addfolders = new Registry;
$addfolders->loadString($item->addfolders);
$item->addfolders = $addfolders->toArray();
// Convert the addurls field to an array.
$addurls = new Registry;
$addurls->loadString($item->addurls);
$item->addurls = $addurls->toArray();
}
if (!empty($item->id))
@@ -827,19 +827,6 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
$data['addfoldersfullpath'] = '';
}
// Set the addurls items to data.
if (isset($data['addurls']) && is_array($data['addurls']))
{
$addurls = new JRegistry;
$addurls->loadArray($data['addurls']);
$data['addurls'] = (string) $addurls;
}
elseif (!isset($data['addurls']))
{
// Set the empty addurls to data
$data['addurls'] = '';
}
// Set the addfilesfullpath items to data.
if (isset($data['addfilesfullpath']) && is_array($data['addfilesfullpath']))
{
@@ -853,6 +840,19 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
$data['addfilesfullpath'] = '';
}
// Set the addfolders items to data.
if (isset($data['addfolders']) && is_array($data['addfolders']))
{
$addfolders = new JRegistry;
$addfolders->loadArray($data['addfolders']);
$data['addfolders'] = (string) $addfolders;
}
elseif (!isset($data['addfolders']))
{
// Set the empty addfolders to data
$data['addfolders'] = '';
}
// Set the addfiles items to data.
if (isset($data['addfiles']) && is_array($data['addfiles']))
{
@@ -866,17 +866,17 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
$data['addfiles'] = '';
}
// Set the addfolders items to data.
if (isset($data['addfolders']) && is_array($data['addfolders']))
// Set the addurls items to data.
if (isset($data['addurls']) && is_array($data['addurls']))
{
$addfolders = new JRegistry;
$addfolders->loadArray($data['addfolders']);
$data['addfolders'] = (string) $addfolders;
$addurls = new JRegistry;
$addurls->loadArray($data['addurls']);
$data['addurls'] = (string) $addurls;
}
elseif (!isset($data['addfolders']))
elseif (!isset($data['addurls']))
{
// Set the empty addfolders to data
$data['addfolders'] = '';
// Set the empty addurls to data
$data['addurls'] = '';
}
// Set the Params Items to data