Skip to content

Various changes in plugins #13213

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 4 commits into from
Dec 18, 2016
Merged

Various changes in plugins #13213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63a6d70
Remove one-time use variable
frankmayer Dec 14, 2016
0adc13d
Merge unset calls
frankmayer Dec 14, 2016
11ef369
Remove obvious variants from ternary operation
frankmayer Dec 14, 2016
5c310ac
Use short syntax for applied operation
frankmayer Dec 14, 2016
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
3 changes: 1 addition & 2 deletions plugins/captcha/recaptcha/recaptchalib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ private function _submitHTTPGet($path, $data)
{
$req = $this->_encodeQS($data);
$http = JHttpFactory::getHttp();
$response = $http->get($path . '?' . $req)->body;

return $response;
return $http->get($path . '?' . $req)->body;
}

/**
Expand Down
10 changes: 5 additions & 5 deletions plugins/system/debug/debug.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ protected function displayProfileInformation()
}
}

$totalQueryTime = $totalQueryTime * 1000;
$totalQueryTime *= 1000;

if ($totalQueryTime > ($totalTime * 0.25))
{
Expand Down Expand Up @@ -1007,12 +1007,12 @@ protected function displayQueries()
// Increment the count.
if (stripos($query, 'select') === 0)
{
$selectQueryTypeTicker[$fromString] = $selectQueryTypeTicker[$fromString] + 1;
$selectQueryTypeTicker[$fromString]++;
unset($otherQueryTypeTicker[$fromString]);
}
else
{
$otherQueryTypeTicker[$fromString] = $otherQueryTypeTicker[$fromString] + 1;
$otherQueryTypeTicker[$fromString]++;
unset($selectQueryTypeTicker[$fromString]);
}

Expand Down Expand Up @@ -1869,7 +1869,7 @@ protected function displayLogs()
}
)
);
$logEntriesTotal = $logEntriesTotal - $logEntriesDatabasequery;
$logEntriesTotal -= $logEntriesDatabasequery;
}

// Deprecated log entries
Expand All @@ -1885,7 +1885,7 @@ protected function displayLogs()

if (!$showDeprecated)
{
$logEntriesTotal = $logEntriesTotal - $logEntriesDeprecated;
$logEntriesTotal -= $logEntriesDeprecated;
}

$showEverything = $this->params->get('log-everything', 0);
Expand Down
3 changes: 1 addition & 2 deletions plugins/system/languagefilter/languagefilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ public function __construct(&$subject, $config)
if (($language->access && !in_array($language->access, $levels))
|| (!array_key_exists($language->lang_code, JLanguageHelper::getInstalledLanguages(0))))
{
unset($this->lang_codes[$language->lang_code]);
unset($this->sefs[$language->sef]);
unset($this->lang_codes[$language->lang_code], $this->sefs[$language->sef]);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/user/profile/field/tos.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected function getLabel()

// Build the class for the label.
$class = !empty($this->description) ? 'hasTooltip' : '';
$class = $class . ' required';
$class .= ' required';
$class = !empty($this->labelClass) ? $class . ' ' . $this->labelClass : $class;

// Add the opening label tag and main attributes attributes.
Expand Down
2 changes: 1 addition & 1 deletion plugins/user/profile/profile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ public function onUserBeforeSave($user, $isnew, $data)
$task = JFactory::getApplication()->input->getCmd('task');
$option = JFactory::getApplication()->input->getCmd('option');
$tosarticle = $this->params->get('register_tos_article');
$tosenabled = ($this->params->get('register-require_tos', 0) == 2) ? true : false;
$tosenabled = ($this->params->get('register-require_tos', 0) == 2);

if (($task == 'register') && ($tosenabled) && ($tosarticle) && ($option == 'com_users'))
{
Expand Down