joomla/Component-Builder
39
25
Fork 12
Code Issues 78 Pull Requests 1 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

42
admin/models/library.php
View File

@ -100,14 +100,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
$item->metadata = $registry->toArray();
}
if (!empty($item->addconditions))
{
// Convert the addconditions field to an array.
$addconditions = new Registry;
$addconditions->loadString($item->addconditions);
$item->addconditions = $addconditions->toArray();
}
if (!empty($item->libraries))
{
// Convert the libraries field to an array.
@ -116,6 +108,14 @@ class ComponentbuilderModelLibrary extends JModelAdmin
$item->libraries = $libraries->toArray();
}
if (!empty($item->addconditions))
{
// Convert the addconditions field to an array.
$addconditions = new Registry;
$addconditions->loadString($item->addconditions);
$item->addconditions = $addconditions->toArray();
}
if (!empty($item->php_setdocument))
{
// base64 Decode php_setdocument.
@ -918,19 +918,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
$data['metadata'] = (string) $metadata;
}
// Set the addconditions items to data.
if (isset($data['addconditions']) && is_array($data['addconditions']))
{
$addconditions = new JRegistry;
$addconditions->loadArray($data['addconditions']);
$data['addconditions'] = (string) $addconditions;
}
elseif (!isset($data['addconditions']))
{
// Set the empty addconditions to data
$data['addconditions'] = '';
}
// Set the libraries items to data.
if (isset($data['libraries']) && is_array($data['libraries']))
{
@ -944,6 +931,19 @@ class ComponentbuilderModelLibrary extends JModelAdmin
$data['libraries'] = '';
}
// Set the addconditions items to data.
if (isset($data['addconditions']) && is_array($data['addconditions']))
{
$addconditions = new JRegistry;
$addconditions->loadArray($data['addconditions']);
$data['addconditions'] = (string) $addconditions;
}
elseif (!isset($data['addconditions']))
{
// Set the empty addconditions to data
$data['addconditions'] = '';
}
// Set the php_setdocument string to base64 string.
if (isset($data['php_setdocument']))
{