spip /
SPIP
| @@ 2672-2675 (lines=4) @@ | ||
| 2669 | if ($var) { |
|
| 2670 | $val = rawurldecode($val); |
|
| 2671 | $var = rawurldecode($var); // decoder les [] eventuels |
|
| 2672 | if (preg_match(',\[\]$,S', $var)) { |
|
| 2673 | $values[] = array($var, $val); |
|
| 2674 | } else { |
|
| 2675 | if (!isset($values[$var])) { |
|
| 2676 | $values[$var] = array($var, $val); |
|
| 2677 | } |
|
| 2678 | } |
|
| @@ 2685-2688 (lines=4) @@ | ||
| 2682 | ||
| 2683 | // ensuite avec celles du contexte, sans doublonner ! |
|
| 2684 | foreach ($contexte as $var => $val) { |
|
| 2685 | if (preg_match(',\[\]$,S', $var)) { |
|
| 2686 | $values[] = array($var, $val); |
|
| 2687 | } else { |
|
| 2688 | if (!isset($values[$var])) { |
|
| 2689 | $values[$var] = array($var, $val); |
|
| 2690 | } |
|
| 2691 | } |
|
