Skip to content

Commit ec7af65

Browse files
authored
[6.1] Provide #__extensions.custom_data for components, menus, modules and template styles (joomla#46622)
1 parent fdb2180 commit ec7af65

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

administrator/components/com_templates/src/Model/StyleModel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ public function getAdminTemplate(int $styleId): \stdClass
653653
{
654654
$db = $this->getDatabase();
655655
$query = $db->createQuery()
656-
->select($db->quoteName(['s.template', 's.params', 's.inheritable', 's.parent']))
656+
->select($db->quoteName(['s.template', 's.params', 's.inheritable', 's.parent', 'e.custom_data']))
657657
->from($db->quoteName('#__template_styles', 's'))
658658
->join(
659659
'LEFT',
@@ -698,7 +698,7 @@ public function getSiteTemplates(): array
698698
{
699699
$db = $this->getDatabase();
700700
$query = $db->createQuery()
701-
->select($db->quoteName(['id', 'home', 'template', 's.params', 'inheritable', 'parent']))
701+
->select($db->quoteName(['id', 'home', 'template', 's.params', 'inheritable', 'parent', 'e.custom_data']))
702702
->from($db->quoteName('#__template_styles', 's'))
703703
->where(
704704
[

libraries/src/Component/ComponentHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ protected static function load()
383383
$loader = function () {
384384
$db = Factory::getDbo();
385385
$query = $db->createQuery()
386-
->select($db->quoteName(['extension_id', 'element', 'params', 'enabled'], ['id', 'option', null, null]))
386+
->select($db->quoteName(['extension_id', 'element', 'params', 'enabled', 'custom_data'], ['id', 'option', null, null, null]))
387387
->from($db->quoteName('#__extensions'))
388388
->where(
389389
[

libraries/src/Component/ComponentRecord.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ class ComponentRecord
6565
*/
6666
public $enabled;
6767

68+
/**
69+
* The component custom data
70+
*
71+
* @var string
72+
* @since __DEPLOY_VERSION__
73+
*/
74+
public $custom_data;
75+
6876
/**
6977
* Class constructor
7078
*

libraries/src/Helper/ModuleHelper.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ public static function getModuleList()
414414
$query = $db->createQuery();
415415
$nowDate = Factory::getDate()->toSql();
416416

417-
$query->select($db->quoteName(['m.id', 'm.title', 'm.module', 'm.position', 'm.content', 'm.showtitle', 'm.params', 'mm.menuid']))
417+
$query->select($db->quoteName(['m.id', 'm.title', 'm.module', 'm.position', 'm.content', 'm.showtitle', 'm.params', 'mm.menuid', 'e.custom_data']))
418418
->from($db->quoteName('#__modules', 'm'))
419419
->join(
420420
'LEFT',
@@ -716,15 +716,16 @@ public static function &getModuleById($id)
716716
*/
717717
protected static function createDummyModule(): \stdClass
718718
{
719-
$module = new \stdClass();
720-
$module->id = 0;
721-
$module->title = '';
722-
$module->module = '';
723-
$module->position = '';
724-
$module->content = '';
725-
$module->showtitle = 0;
726-
$module->control = '';
727-
$module->params = '';
719+
$module = new \stdClass();
720+
$module->id = 0;
721+
$module->title = '';
722+
$module->module = '';
723+
$module->position = '';
724+
$module->content = '';
725+
$module->showtitle = 0;
726+
$module->control = '';
727+
$module->params = '';
728+
$module->custom_data = '';
728729

729730
return $module;
730731
}

libraries/src/Plugin/PluginHelper.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,14 @@ protected static function load()
271271
'element',
272272
'params',
273273
'extension_id',
274+
'custom_data',
274275
],
275276
[
276277
'type',
277278
'name',
278279
'params',
279280
'id',
281+
null,
280282
]
281283
)
282284
)

0 commit comments

Comments
 (0)