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.

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

Jump to bottom

Fix for #6904 --> Fixed the check on published content languages. #7130

Closed
wants to merge 7 commits into from
Closed

Fix for #6904 --> Fixed the check on published content languages. #7130

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a50bf7
Fix for #6904
smz Jun 6, 2015
327cbfa
Added check against MultilangstatusHelper::getHomepages()
smz Jun 6, 2015
1340c6c
ouch!
smz Jun 6, 2015
257510d
Added check if language folder exist
smz Jun 6, 2015
ad26ee3
Per @infograf768 request
smz Jun 7, 2015
787640e
Fixed a comment
smz Jun 8, 2015
73bdd37
Removed a comment
smz Jun 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 5 additions & 20 deletions plugins/system/languagefilter/languagefilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@ class PlgSystemLanguageFilter extends JPlugin

private $user_lang_code;

/**
* JDatabaseDriver instance
*
* @var JDatabaseDriver
* @since 3.4.2
*/
protected $db = null;

/**
* Application object.
*
Expand Down Expand Up @@ -525,24 +517,17 @@ public function onUserLogin($user, $options = array())
$assoc = JLanguageAssociations::isEnabled();
$lang_code = $user['language'];

// If no language is specified for this user, we set it to the site default language
if (empty($lang_code))
{
$lang_code = $this->default_lang;
}

// Get a 1-dimensional array of published language codes
$query = $this->db->getQuery(true)
->select($this->db->quoteName('a.lang_code'))
->from($this->db->quoteName('#__languages', 'a'))
->where($this->db->quoteName('published') . ' = 1');
$this->db->setQuery($query);
$lang_codes = $this->db->loadColumn();

// The user language has been deleted/disabled or the related content language does not exist/has been unpublished
// The language has been deleted/disabled or the related content language does not exist/has been unpublished
// or the related home page does not exist/has been unpublished
if (!array_key_exists($lang_code, MultilangstatusHelper::getSitelangs())
|| !in_array($lang_code, $lang_codes)
|| !array_key_exists($lang_code, MultilangstatusHelper::getHomepages()))
if (!array_key_exists($lang_code, $this->lang_codes)
|| !array_key_exists($lang_code, MultilangstatusHelper::getHomepages())
|| !JFolder::exists(JPATH_SITE . '/language/' . $lang_code))
{
$lang_code = $this->current_lang;
}
Expand Down