Overview
Comment: | Merge avec trunk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
55df9fab5ddc8047260dc77c9ed80878 |
User & Date: | bohwaz on 2017-01-23 05:39:55 |
Other Links: | branch diff | manifest | tags |
Context
2017-01-26
| ||
00:19 | Ajout authentification à double facteur (OTP) check-in: 633bea8e4a user: bohwaz tags: dev | |
2017-01-23
| ||
05:39 | Merge avec trunk check-in: 55df9fab5d user: bohwaz tags: dev | |
00:02 | Fix: undefined index 'align' on line 666 check-in: 1925c75755 user: bohwaz tags: trunk | |
2017-01-19
| ||
21:34 | Merge avec trunk check-in: 1b1ebb4095 user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Fichiers.php from [3b1bc8db8b] to [2f1047e8fe].
︙ | ︙ | |||
616 617 618 619 620 621 622 | * Callback utilisé pour l'extension <<image>> dans le wiki-texte * @param array $args Arguments passés à l'extension * @param string $content Contenu éventuel (en mode bloc) * @param object $skriv Objet SkrivLite */ static public function SkrivImage($args, $content, $skriv) { | | | 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 | * Callback utilisé pour l'extension <<image>> dans le wiki-texte * @param array $args Arguments passés à l'extension * @param string $content Contenu éventuel (en mode bloc) * @param object $skriv Objet SkrivLite */ static public function SkrivImage($args, $content, $skriv) { $_args = ['align' => 'centre']; $_align_values = ['droite', 'gauche', 'centre']; foreach ($args as $value) { if (preg_match('/^\d+$/', $value) && !array_key_exists('id', $_args)) { $_args['id'] = (int)$value; |
︙ | ︙ |
Modified src/www/.htaccess from [c992fe3d1c] to [270ad9f48c].
1 2 3 4 5 6 7 8 9 10 11 12 | <IfModule mod_rewrite.c> RewriteEngine on RewriteRule admin/plugin/(.*?)/(.*) /admin/plugin.php?_p=$1&_u=$2 [QSA,L] RewriteRule f/([\d\w]+)/(.*) /file.php?id=$1&file=$2 [QSA,L] RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule .* /index.php [QSA,L] </IfModule> <IfModule !mod_rewrite.c> ErrorDocument 404 /index.php </IfModule> | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | Options -MultiViews -Indexes <IfModule mod_rewrite.c> RewriteEngine on RewriteRule admin/plugin/(.*?)/(.*) /admin/plugin.php?_p=$1&_u=$2 [QSA,L] RewriteRule f/([\d\w]+)/(.*) /file.php?id=$1&file=$2 [QSA,L] RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule .* /index.php [QSA,L] </IfModule> <IfModule !mod_rewrite.c> ErrorDocument 404 /index.php </IfModule> |