Changeset 111409 in spip-zone

Timestamp:

Aug 23, 2018, 7:17:45 PM (2 years ago)

Author:

eric@…

Message:

Correction de l'initialisation du code de langue

File:

• _plugins_/isocode/trunk/demo/isocode_fonctions.php (modified) (4 diffs)

_plugins_/isocode/trunk/demo/isocode_fonctions.php

@@ -70 +70 @@
                         $from = array('spip_iso639codes');
                         $select = array('*');
-                        $default = array('nom_spip' => $_nom, 'type_code' => '', 'erreur' => false);
+                        $codes_verifies[$_code] = array('nom_spip' => $_nom, 'type_code' => '', 'erreur' => false);
                         if (strlen($_code) == 2) {
                                 // Si le code a une taille de 2 caractères on recherche de suite dans la table iso639codes
@@ -77 +77 @@
                                 $codes_iso = sql_fetsel($select, $from, $where);
                                 if ($codes_iso) {
-                                        $codes_verifies[$_code] = array_merge($default, $codes_iso);
+                                        $codes_verifies[$_code] = array_merge($codes_verifies[$_code], $codes_iso);
                                         $codes_verifies[$_code]['type_code'] = '639-1';
                                 } else {
@@ -89 +89 @@
                                 $codes_iso = sql_fetsel($select, $from, $where);
                                 if ($codes_iso) {
-                                        $codes_verifies[$_code] = array_merge($default, $codes_iso);
+                                        $codes_verifies[$_code] = array_merge($codes_verifies[$_code], $codes_iso);
                                         $codes_verifies[$_code]['type_code'] = '639-3';
                                 } else {
@@ -95 +95 @@
                                         $code_famille = sql_fetsel($select, array('spip_iso639families'), $where);
                                         if ($code_famille) {
-                                                $codes_verifies[$_code] = array_merge($default, $code_famille);
+                                                $codes_verifies[$_code] = array_merge($codes_verifies[$_code], $code_famille);
                                                 $codes_verifies[$_code]['type_code'] = '639-5';
                                         } else {