Try a better fix

Dolibarr · Feb 25, 2012 · de187ab · de187ab
1 parent 3dcb900
commit de187ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
@@ -229,7 +229,7 @@
 
         $object->origin    = $_POST['origin'];
         $object->origin_id = $_POST['originid'];
-        
+
         // Possibility to add external linked objects with hooks
         $object->linked_objects[$object->origin] = $object->origin_id;
         if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
@@ -641,15 +641,14 @@
                     {
                     	// Define output language
                     	$outputlangs = $langs;
-                    	$newlang='';
-                    	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','int')) $newlang=GETPOST('lang_id','int');
+                    	$newlang=GETPOST('lang_id','alpha');
                     	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
                     	if (! empty($newlang))
                     	{
                     		$outputlangs = new Translate("",$conf);
                     		$outputlangs->setDefaultLang($newlang);
                     	}
-                    	
+
                         $ret=$object->fetch($id);    // Reload to get new records
                         commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager);
                     }

diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
@@ -221,15 +221,14 @@
             {
             	// Define output language
             	$outputlangs = $langs;
-            	$newlang='';
-            	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','int')) $newlang=GETPOST('lang_id','int');
-            	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+                $newlang=GETPOST('lang_id','alpha');
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
             	if (! empty($newlang))
             	{
             		$outputlangs = new Translate("",$conf);
             		$outputlangs->setDefaultLang($newlang);
             	}
-            	
+
                 $ret=$object->fetch($id);    // Reload to get new records
                 supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'));
             }

diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
@@ -509,9 +509,8 @@
     {
     	// Define output language
     	$outputlangs = $langs;
-    	$newlang='';
-    	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','int')) $newlang=GETPOST('lang_id','int');
-    	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+        $newlang=GETPOST('lang_id','alpha');
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
     	if (! empty($newlang))
     	{
     		$outputlangs = new Translate("",$conf);