Changeset 109950 in spip-zone

Timestamp:

Apr 19, 2018, 11:15:54 AM (3 years ago)

Author:

abelass

Message:

Merge branch 'master' into v1

Conflicts:

paquet.xml
promotions/reservation_multiple_simple.php

Location:

_plugins_/reservations_multiples/branches/v1

Files:

• . (modified) (2 props)
• paquet.xml (modified) (2 diffs)
• promotions/reservation_multiple_simple.php (modified) (1 diff)

_plugins_/reservations_multiples/branches/v1/paquet.xml

@@ -2 +2 @@
         prefix="reservations_multiples"
         categorie="communication"
-        version="1.5.2"
+        version="1.5.3"
         etat="test"
         compatibilite="[3.0.16;3.2.*]"
@@ -16 +16 @@
         <licence>GNU/GPL</licence>
 
-        <necessite nom="reservation_evenement" compatibilite="[1.26.6;]" />
+        <necessite nom="reservation_evenement" compatibilite="[1.28.3;]" />
         <necessite nom="saisies" compatibilite="[2.18.12;]" />
 

_plugins_/reservations_multiples/branches/v1/promotions/reservation_multiple_simple.php

@@ -6 +6 @@
 function promotions_reservation_multiple_simple_dist($flux = '') {
         return array(
-                'nom' => _T('reservations_multiples:nom_reservation_multiple_simple')
+                'nom' => _T('reservations_multiples:nom_reservation_multiple_simple'),
+                'plugins_applicables' => 'reservation_evenement',
         );
 }