Improve the language change on FAQs.

Signed-off-by: Gustavo Solt <gustavo.solt@mayflower.de>
thorsten · Dec 7, 2010 · dce812c · dce812c
1 parent 69ae744
commit dce812c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/phpmyfaq/artikel.php b/phpmyfaq/artikel.php
@@ -48,6 +48,9 @@
 $solution_id     = PMF_Filter::filterInput(INPUT_GET, 'solution_id', FILTER_VALIDATE_INT);
 $highlight       = PMF_Filter::filterInput(INPUT_GET, 'highlight', FILTER_SANITIZE_STRIPPED);
 
+// Set the art language
+$faq->setLanguage($lang);
+
 // Get all data from the FAQ record
 if (0 == $solution_id) {
     $faq->getRecord($record_id);
@@ -147,7 +150,7 @@
     $switchLanguage .= "<fieldset>\n";
     $switchLanguage .= "<legend>".$PMF_LANG["msgLangaugeSubmit"]."</legend>\n";
     $switchLanguage .= "<form action=\"".$changeLanguagePath."\" method=\"post\" style=\"display: inline;\">\n";
-    $switchLanguage .= "<select name=\"language\" size=\"1\">\n";
+    $switchLanguage .= "<select name=\"artlang\" size=\"1\">\n";
     $switchLanguage .= $check4Lang;
     $switchLanguage .= "</select>\n";
     $switchLanguage .= "&nbsp;\n";

diff --git a/phpmyfaq/index.php b/phpmyfaq/index.php
@@ -237,7 +237,10 @@
 //
 $lang = PMF_Filter::filterInput(INPUT_POST, 'artlang', FILTER_SANITIZE_STRING);
 if (is_null($lang) && !PMF_Language::isASupportedLanguage($lang) ) {
-    $lang = $LANGCODE;
+    $lang = PMF_Filter::filterInput(INPUT_GET, 'artlang', FILTER_SANITIZE_STRING);
+    if (is_null($lang) && !PMF_Language::isASupportedLanguage($lang) ) {
+        $lang = $LANGCODE;
+    }
 }
 
 //