Skip to content

[4.0] Installer library qn/q #21461

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 8, 2018
Merged

[4.0] Installer library qn/q #21461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions libraries/src/Installer/Adapter/ComponentAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,11 +603,11 @@ public function prepareDiscoverInstall()
$db = $this->db;

$query = $db->getQuery(true)
->select($db->qn('extension_id'))
->from($db->qn('#__extensions'))
->where($db->qn('name') . ' = :name')
->where($db->qn('type') . ' = :type')
->where($db->qn('element') . ' = :element')
->select($db->quoteName('extension_id'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('name') . ' = :name')
->where($db->quoteName('type') . ' = :type')
->where($db->quoteName('element') . ' = :element')
->bind(':name', $name)
->bind(':type', $type)
->bind(':element', $element);
Expand Down Expand Up @@ -797,11 +797,11 @@ protected function storeExtension($deleteExisting = false)
$db = $this->db;

$query = $db->getQuery(true)
->select($db->qn('extension_id'))
->from($db->qn('#__extensions'))
->where($db->qn('name') . ' = :name')
->where($db->qn('type') . ' = :type')
->where($db->qn('element') . ' = :element')
->select($db->quoteName('extension_id'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('name') . ' = :name')
->where($db->quoteName('type') . ' = :type')
->where($db->quoteName('element') . ' = :element')
->bind(':name', $name)
->bind(':type', $type)
->bind(':element', $element);
Expand Down Expand Up @@ -1092,7 +1092,7 @@ protected function _removeAdminMenus($id)
->select('id')
->from('#__menu')
->where($db->quoteName('client_id') . ' = 1')
->where($db->quoteName('menutype') . ' = ' . $db->q('main'))
->where($db->quoteName('menutype') . ' = ' . $db->quote('main'))
->where($db->quoteName('component_id') . ' = :id')
->bind(':id', $id, ParameterType::INTEGER);

Expand Down Expand Up @@ -1161,7 +1161,7 @@ protected function _updateMenus($component_id, $clientId = null)
->where('type = ' . $db->quote('component'))
->where('('
. 'link LIKE ' . $db->quote('index.php?option=' . $option) . ' OR '
. 'link LIKE ' . $db->q($db->escape('index.php?option=' . $option . '&') . '%', false)
. 'link LIKE ' . $db->quote($db->escape('index.php?option=' . $option . '&') . '%', false)
. ')');

if (isset($clientId))
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Installer/Adapter/LanguageAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,8 @@ protected function getSefString($itemLanguageTag)
// Get the sef value of all current content languages.
$db = Factory::getDbo();
$query = $db->getQuery(true)
->select($db->qn('sef'))
->from($db->qn('#__languages'));
->select($db->quoteName('sef'))
->from($db->quoteName('#__languages'));
$db->setQuery($query);

$siteLanguages = $db->loadObjectList();
Expand Down