joomla/Component-Builder
39
25
Fork 11
Code Issues 78 Pull Requests Projects 4 Wiki Activity

Fixed GUID duplication issue.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2020-05-25 02:38:16 +02:00
parent eda4d594d6
commit 5f1d17bfb3
23 changed files with 241 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/models/admin_view.php
View File

@ -1491,7 +1491,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
}
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "admin_view", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/class_method.php
View File

@ -972,7 +972,7 @@ class ComponentbuilderModelClass_method extends JModelAdmin
$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "class_method", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/class_property.php
View File

@ -963,7 +963,7 @@ class ComponentbuilderModelClass_property extends JModelAdmin
$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "class_property", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/custom_admin_view.php
View File

@ -1125,7 +1125,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
}
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "custom_admin_view", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/dynamic_get.php
View File

@ -1148,7 +1148,7 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "dynamic_get", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/field.php
View File

@ -1144,7 +1144,7 @@ class ComponentbuilderModelField extends JModelAdmin
}
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "field", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/fieldtype.php
View File

@ -1197,7 +1197,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "fieldtype", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/joomla_component.php
View File

@ -1385,7 +1385,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
}
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "joomla_component", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/joomla_module.php
View File

@ -1199,7 +1199,7 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
}
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "joomla_module", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/joomla_plugin.php
View File

@ -1162,7 +1162,7 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
}
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "joomla_plugin", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/library.php
View File

@ -1048,7 +1048,7 @@ class ComponentbuilderModelLibrary extends JModelAdmin
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "library", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/site_view.php
View File

@ -1146,7 +1146,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin
}
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "site_view", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}

2
admin/models/snippet.php
View File

@ -852,7 +852,7 @@ class ComponentbuilderModelSnippet extends JModelAdmin
}
// Set the GUID if empty or not valid
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid']))
if (isset($data['guid']) && !ComponentbuilderHelper::validGUID($data['guid'], "snippet", $data['id']))
{
$data['guid'] = (string) ComponentbuilderHelper::GUID();
}