Overview
Comment:Correction pour sous-pages avec {parent}
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 88c2588e64d8346908856a36ae2620e7a5288799
User & Date: bohwaz on 2015-01-18 07:10:41
Other Links: manifest | tags
Context
2015-01-20
06:29
Adaptation à la révision de MiniSkel pour permettre les tags imbriqués. Vérification de sécurité à la compilation plutôt qu'à l'exécution. Ajout d'une balise #LANGUE_VISITEUR. check-in: eb6cca0e56 user: bohwaz tags: trunk
2015-01-18
07:10
Correction pour sous-pages avec {parent} check-in: 88c2588e64 user: bohwaz tags: trunk
07:03
Optimisation : un seul appel pour savoir le type check-in: acafe56460 user: bohwaz tags: trunk
Changes

Modified src/include/lib/Garradin/Squelette.php from [fdde7426b0] to [d09cf367fb].

411
412
413
414
415
416
417


418
419
420

421
422
423
424
425
426
427
428
429
430
                        {
                            $query = 'SELECT w.*, r.contenu AS texte, rank(matchinfo(wiki_recherche), 0, 1.0, 1.0) AS points FROM wiki_pages AS w INNER JOIN wiki_recherche AS r ON (w.id = r.id) ';
                            $where .= ' AND wiki_recherche MATCH ?';
                            $search = true;
                        }
                        else
                        {


                            if ($criteria['field'] == 'parent')
                                $field = 'id';
                            else

                                $field = $criteria['field'];

                            $where .= ' AND '.$criteria['field'].' = ?';
                        }
                        
                        $query_args[] = ['$this->getVariable(\'' . $criteria['field'] . '\')'];
                        break;
                    }
                    default:
                        break;







>
>

<
<
>
|
|
<







411
412
413
414
415
416
417
418
419
420


421
422
423

424
425
426
427
428
429
430
                        {
                            $query = 'SELECT w.*, r.contenu AS texte, rank(matchinfo(wiki_recherche), 0, 1.0, 1.0) AS points FROM wiki_pages AS w INNER JOIN wiki_recherche AS r ON (w.id = r.id) ';
                            $where .= ' AND wiki_recherche MATCH ?';
                            $search = true;
                        }
                        else
                        {
                            $where .= ' AND '.$criteria['field'].' = ?';

                            if ($criteria['field'] == 'parent')


                            {
                                $criteria['field'] = 'id';
                            }

                        }
                        
                        $query_args[] = ['$this->getVariable(\'' . $criteria['field'] . '\')'];
                        break;
                    }
                    default:
                        break;