Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change type of field "value" in table #_fields_values from text to mediumtext #42605

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3aa5fa9
Fix link and button colors in header footer (#42504)
RickR2H Dec 20, 2023
d8648aa
[4.x] add php 8.3 to tests (#42545)
heelc29 Dec 20, 2023
6fc05f7
Update the signature for #42545 (#42552)
laoneo Dec 20, 2023
3265efa
[4.4] Joomlaupdate remove br tag from language strings - follow up to…
richard67 Dec 20, 2023
ba77187
Change type of field "value" in table #_fields_values from text to me…
sergeytolkachyov Dec 22, 2023
58ccc93
Fixes to form validation process (#42560)
wilsonge Dec 23, 2023
3927cea
[4][com_actionlogs] missed load plugin languages (#42562)
alikon Dec 26, 2023
e125943
Better message on package uninstallation (#42570)
richard67 Dec 27, 2023
83f50fd
backport #41865 (#42088)
alikon Dec 27, 2023
63b392a
[5] harmonize naming task types (#42574)
alikon Dec 30, 2023
9248355
[5.0] colour contrast in media manager file list [a11y] (#42544)
brianteeman Dec 30, 2023
d76cf02
Merge remote-tracking branch 'Joomla/4.4-dev' into 5.0-dev
bembelimen Dec 30, 2023
af3ed9a
Merge pull request #42580 from bembelimen/5.0/upmerge-2023-12-30
bembelimen Dec 30, 2023
eaf830e
[5.0] Update phpseclib to 3.0.34 (#42469)
SniperSister Dec 31, 2023
2912ccd
Fix `function` parameter lost during redirect (#42315)
janschoenherr Dec 31, 2023
80751a6
[4.4] Fix SQL error "1104 The SELECT would examine more than MAX_JOIN…
richard67 Dec 31, 2023
2b1cc9a
Revert min version in drone (#42583)
bembelimen Dec 31, 2023
dfda820
Joomla! 5.0.2 Release Candidate 1
bembelimen Dec 31, 2023
adbdb7f
Revert to dev
bembelimen Dec 31, 2023
f97a4c5
[4][com_templates] cast to int for pgsql (#42569)
alikon Dec 31, 2023
56bf784
patch article tags (#42486)
alikon Jan 2, 2024
cfed3e1
Merge remote-tracking branch 'Joomla/4.4-dev' into upmerges/2024-01-02
bembelimen Jan 2, 2024
6be3854
Merge pull request #42591 from bembelimen/5.0/upmerge-2024-01-02
bembelimen Jan 2, 2024
2adbbbf
Joomla 5.0.2 Release Candidate 2
bembelimen Jan 2, 2024
94bf1eb
Reset to dev
bembelimen Jan 2, 2024
0e7ba9b
Merge branch 'joomla:5.0-dev' into 5.0-dev
sergeytolkachyov Jan 4, 2024
d8d29a1
Change type of field "value" in table #_fields_values from text to me…
sergeytolkachyov Jan 4, 2024
c2d8503
Update installation/sql/postgresql/supports.sql
sergeytolkachyov Jan 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -879,8 +879,8 @@ public function &getSource()
$fileName = str_replace('//', '/', $fileName);
$isMedia = $input->getInt('isMedia', 0);

$fileName = $isMedia ? Path::clean(JPATH_ROOT . '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . $fileName)
: Path::clean(JPATH_ROOT . ($this->template->client_id === 0 ? '' : '/administrator') . '/templates/' . $this->template->element . $fileName);
$fileName = $isMedia ? Path::clean(JPATH_ROOT . '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . $fileName)
: Path::clean(JPATH_ROOT . ((int) $this->template->client_id === 0 ? '' : '/administrator') . '/templates/' . $this->template->element . $fileName);

try {
$filePath = Path::check($fileName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<div class="row mt-2">
<div class="col-md-8" id="conditional-section">
<?php if ($this->type != 'home') : ?>
<p class="lead"><?php echo Text::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', '&#x200E;' . ($input->get('isMedia', 0) ? '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . str_replace('//', '/', base64_decode($this->file)) : '/' . ($this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element . str_replace('//', '/', base64_decode($this->file))), $this->template->element); ?></p>
<p class="lead"><?php echo Text::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', '&#x200E;' . ($input->get('isMedia', 0) ? '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . str_replace('//', '/', base64_decode($this->file)) : '/' . ((int) $this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element . str_replace('//', '/', base64_decode($this->file))), $this->template->element); ?></p>
<p class="lead path hidden"><?php echo $this->source->filename; ?></p>
<?php endif; ?>
</div>
Expand All @@ -80,7 +80,7 @@
<li class="folder-select">
<a class="folder-url" data-id="" href="">
<span class="icon-folder icon-fw" aria-hidden="true"></span>
<?php echo ($this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
<?php echo ((int) $this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
</a>
<?php echo $this->loadTemplate('tree'); ?>
</li>
Expand All @@ -90,7 +90,7 @@
<li class="folder-select">
<a class="folder-url" data-id="" href="">
<span class="icon-folder icon-fw" aria-hidden="true"></span>
<?php echo '/media/templates/' . ($this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
<?php echo '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
</a>
<?php echo $this->loadTemplate('tree_media'); ?>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,11 @@ protected function preprocessSaveData(array $data): array
}
}

$tags = new TagsHelper();
$tags->getTagIds($data['id'], 'com_content.article');
$data['tags'] = explode(',', $tags->tags);
if (($this->input->getMethod() === 'PATCH') && !(\array_key_exists('tags', $data))) {
$tags = new TagsHelper();
$tags->getTagIds($data['id'], 'com_content.article');
$data['tags'] = explode(',', $tags->tags);
}

return $data;
}
Expand Down
22 changes: 16 additions & 6 deletions libraries/src/Extension/ExtensionHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,25 @@ public static function getCoreExtensionIds()
->select($db->quoteName('extension_id'))
->from($db->quoteName('#__extensions'));

$values = [];

foreach (self::$coreExtensions as $extension) {
$values = $query->bindArray($extension, [ParameterType::STRING, ParameterType::STRING, ParameterType::STRING, ParameterType::INTEGER]);
$query->where(
'(' . $db->quoteName('type') . ' = ' . $values[0] . ' AND ' . $db->quoteName('element') . ' = ' . $values[1]
. ' AND ' . $db->quoteName('folder') . ' = ' . $values[2] . ' AND ' . $db->quoteName('client_id') . ' = ' . $values[3] . ')',
'OR'
);
$values[] = $extension[0] . '|' . $extension[1] . '|' . $extension[2] . '|' . $extension[3];
}

$query->whereIn(
$query->concatenate(
[
$db->quoteName('type'),
$db->quoteName('element'),
$db->quoteName('folder'),
$db->quoteName('client_id'),
],
'|'
),
$values
);

$db->setQuery($query);
self::$coreExtensionIds = $db->loadColumn();

Expand Down