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

Stable Release of version 2.10.5

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2019-11-09 14:49:20 +02:00
parent 04c080d460
commit 1a18f5a386
19 changed files with 1624 additions and 1586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
admin/models/library.php
View File

@@ -37,6 +37,7 @@ class ComponentbuilderModelLibrary extends JModelAdmin
'note_no_behaviour_one',
'note_yes_behaviour_one',
'note_build_in_behaviour_one',
'note_yes_behaviour_library',
'addconditions',
'php_setdocument'
),
@@ -189,14 +190,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
$item->php_setdocument = base64_decode($item->php_setdocument);
}
if (!empty($item->libraries))
{
// Convert the libraries field to an array.
$libraries = new Registry;
$libraries->loadString($item->libraries);
$item->libraries = $libraries->toArray();
}
if (!empty($item->addconditions))
{
// Convert the addconditions field to an array.
@@ -205,6 +198,14 @@ class ComponentbuilderModelLibrary extends JModelAdmin
$item->addconditions = $addconditions->toArray();
}
if (!empty($item->libraries))
{
// Convert the libraries field to an array.
$libraries = new Registry;
$libraries->loadString($item->libraries);
$item->libraries = $libraries->toArray();
}
if (empty($item->id))
{
@@ -1036,19 +1037,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
$data['metadata'] = (string) $metadata;
}
// Set the libraries items to data.
if (isset($data['libraries']) && is_array($data['libraries']))
{
$libraries = new JRegistry;
$libraries->loadArray($data['libraries']);
$data['libraries'] = (string) $libraries;
}
elseif (!isset($data['libraries']))
{
// Set the empty libraries to data
$data['libraries'] = '';
}
// Set the addconditions items to data.
if (isset($data['addconditions']) && is_array($data['addconditions']))
{
@@ -1062,6 +1050,19 @@ class ComponentbuilderModelLibrary extends JModelAdmin
$data['addconditions'] = '';
}
// Set the libraries items to data.
if (isset($data['libraries']) && is_array($data['libraries']))
{
$libraries = new JRegistry;
$libraries->loadArray($data['libraries']);
$data['libraries'] = (string) $libraries;
}
elseif (!isset($data['libraries']))
{
// Set the empty libraries to data
$data['libraries'] = '';
}
// Set the php_setdocument string to base64 string.
if (isset($data['php_setdocument']))
{