Skip to content

Remove check for a valid form from two places in plugins #20277

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 2 commits into from
May 23, 2018
Merged

Remove check for a valid form from two places in plugins #20277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebc2c34
If that is not a valid form our system is broken at all
zero-24 May 1, 2018
6cc4530
Typehint the form argument
zero-24 May 1, 2018
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
10 changes: 1 addition & 9 deletions plugins/system/languagecode/languagecode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,8 @@ public function onAfterRender()
*
* @since 2.5
*/
public function onContentPrepareForm($form, $data)
public function onContentPrepareForm(JForm $form, $data)
{
// Check we have a form.
if (!($form instanceof JForm))
{
$this->_subject->setError('JERROR_NOT_A_FORM');

return false;
}

// Check we are manipulating the languagecode plugin.
if ($form->getName() !== 'com_plugins.plugin' || !$form->getField('languagecodeplugin', 'params'))
{
Expand Down
9 changes: 1 addition & 8 deletions plugins/user/profile/profile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,8 @@ public static function tos($value)
*
* @since 1.6
*/
public function onContentPrepareForm($form, $data)
public function onContentPrepareForm(JForm $form, $data)
{
if (!($form instanceof JForm))
{
$this->_subject->setError('JERROR_NOT_A_FORM');

return false;
}

// Check we are manipulating a valid form.
$name = $form->getName();

Expand Down