Overview
Comment: | Ne pas écraser un caption potentiel, cf. ticket [a1c9d3d170b15ab6e135a3f4ba0893a94609db6e] signalé par @fpoulain |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
06f4c192d1dc7fbaa6eb872f9a5971c8 |
User & Date: | bohwaz on 2016-02-20 13:18:36 |
Other Links: | manifest | tags |
Context
2016-04-25
| ||
12:19 | Renvoie un message user-friendly quand fichier n'existe pas check-in: 1d84b4497f user: bohwaz tags: trunk, stable | |
2016-02-20
| ||
13:18 | Ne pas écraser un caption potentiel, cf. ticket [a1c9d3d170b15ab6e135a3f4ba0893a94609db6e] signalé par @fpoulain check-in: 06f4c192d1 user: bohwaz tags: trunk | |
12:39 | Merge old trunk diversion, as noticed by latest fossil update check-in: 6659412978 user: bohwaz tags: trunk | |
Changes
Modified src/include/lib/Garradin/Fichiers.php from [fada28820d] to [3b1bc8db8b].
︙ | ︙ | |||
584 585 586 587 588 589 590 591 592 593 594 595 596 597 | $_args = []; foreach ($args as $value) { if (preg_match('/^\d+$/', $value)) { $_args['id'] = (int)$value; } } if (empty($_args['id'])) { return $skriv->parseError('/!\ Tag fichier : aucun numéro de fichier indiqué.'); } | > | 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 | $_args = []; foreach ($args as $value) { if (preg_match('/^\d+$/', $value)) { $_args['id'] = (int)$value; break; } } if (empty($_args['id'])) { return $skriv->parseError('/!\ Tag fichier : aucun numéro de fichier indiqué.'); } |
︙ | ︙ | |||
620 621 622 623 624 625 626 | static public function SkrivImage($args, $content, $skriv) { $_args = []; $_align_values = ['droite', 'gauche', 'centre']; foreach ($args as $value) { | | | | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 | static public function SkrivImage($args, $content, $skriv) { $_args = []; $_align_values = ['droite', 'gauche', 'centre']; foreach ($args as $value) { if (preg_match('/^\d+$/', $value) && !array_key_exists('id', $_args)) { $_args['id'] = (int)$value; } else if (in_array($value, $_align_values) && !array_key_exists('align', $_args)) { $_args['align'] = $value; } else { $_args['caption'] = $value; } |
︙ | ︙ |