gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Template dependency as a parameter in LanguageManager

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2019-06-14 16:10:05 -03:00
parent 553b188e15
commit f96c41f1ab
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/classes/Controllers/HomeController.php
View File

@ -143,7 +143,7 @@ class HomeController extends AbstractController
$languageSelector = '';
if (empty($cfg['Lang']) && $languageManager->hasChoice()) {
$languageSelector = $languageManager->getSelectorDisplay();
$languageSelector = $languageManager->getSelectorDisplay($this->template);
}
$themeSelection = '';

22
libraries/classes/LanguageManager.php
View File

@ -671,19 +671,6 @@ class LanguageManager
*/
private static $instance;
/**
* @var Template
*/
public $template;
/**
* LanguageManager constructor.
*/
public function __construct()
{
$this->template = new Template();
}
/**
* Returns LanguageManager singleton
*
@ -945,14 +932,15 @@ class LanguageManager
/**
* Returns HTML code for the language selector
*
* @param boolean $use_fieldset whether to use fieldset for selection
* @param boolean $show_doc whether to show documentation links
* @param Template $template Template instance
* @param boolean $use_fieldset whether to use fieldset for selection
* @param boolean $show_doc whether to show documentation links
*
* @return string
*
* @access public
*/
public function getSelectorDisplay($use_fieldset = false, $show_doc = true)
public function getSelectorDisplay(Template $template, $use_fieldset = false, $show_doc = true)
{
$_form_params = [
'db' => $GLOBALS['db'],
@ -970,7 +958,7 @@ class LanguageManager
$available_languages = $this->sortedLanguages();
return $this->template->render('select_lang', [
return $template->render('select_lang', [
'language_title' => $language_title,
'use_fieldset' => $use_fieldset,
'available_languages' => $available_languages,

2
libraries/classes/Plugins/Auth/AuthenticationCookie.php
View File

@ -175,7 +175,7 @@ class AuthenticationCookie extends AuthenticationPlugin
if (empty($GLOBALS['cfg']['Lang']) && $language_manager->hasChoice()) {
echo "<div class='hide js-show'>";
// use fieldset, don't show doc link
echo $language_manager->getSelectorDisplay(true, false);
echo $language_manager->getSelectorDisplay(new Template(), true, false);
echo '</div>';
}
echo '