Commit 60ba0e35 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'laminas_migration_bs5' of https://git.unicaen.fr/lib/unicaen/renderer into HEAD

parents dce1aaef b07e2485

src/UnicaenRenderer/Service/Macro/MacroService.php

+3 −2
Original line number Diff line number Diff line
@@ -176,8 +176,9 @@ class MacroService { 
    {

        $code = str_replace('VAR[','', $code);

        $code = str_replace(']','', $code);

        $parameter = explode("|",$code)[1];

        $code = explode("|",$code)[0];

        $pieces = explode("|", $code);

        $parameter = (isset($pieces[1]))?$pieces[1]:null;

        $code = (isset($pieces[1]))?$pieces[0]:null;

        $macro = $this->getMacroByCode($code);



        if ($macro !== null) {

view/unicaen-renderer/macro/partial/filtre.phtml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    </div>



    <div class="card-body">

        <form method="get" id="filtre" action="<?php echo $this->url(); ?>">

        <form method="get" id="filtre" action="<?php echo $this->url('contenu/macro', [], [], true); ?>">

            <div class="row">

                <!-- Variable -------------------------------------------------------- -->

                <div class="col-md-9">