spip /
SPIP
| @@ 2689-2692 (lines=4) @@ | ||
| 2686 | if ($var) { |
|
| 2687 | $val = rawurldecode($val); |
|
| 2688 | $var = rawurldecode($var); // decoder les [] eventuels |
|
| 2689 | if (preg_match(',\[\]$,S', $var)) { |
|
| 2690 | $values[] = array($var, $val); |
|
| 2691 | } else { |
|
| 2692 | if (!isset($values[$var])) { |
|
| 2693 | $values[$var] = array($var, $val); |
|
| 2694 | } |
|
| 2695 | } |
|
| @@ 2702-2705 (lines=4) @@ | ||
| 2699 | ||
| 2700 | // ensuite avec celles du contexte, sans doublonner ! |
|
| 2701 | foreach ($contexte as $var => $val) { |
|
| 2702 | if (preg_match(',\[\]$,S', $var)) { |
|
| 2703 | $values[] = array($var, $val); |
|
| 2704 | } else { |
|
| 2705 | if (!isset($values[$var])) { |
|
| 2706 | $values[$var] = array($var, $val); |
|
| 2707 | } |
|
| 2708 | } |
|
