sof...@adullact.net
unread,Oct 13, 2017, 9:11:10 AM10/13/17Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
Sign in to report message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to openmairi...@googlegroups.com
Author: softime
Date: 2017-10-13 15:11:03 +0200 (Fri, 13 Oct 2017)
New Revision: 7566
Modified:
branches/4.5.0_OM_4.7_prop0006/obj/instruction.class.php
branches/4.5.0_OM_4.7_prop0006/tests/testGeneral.php
Log:
* Correction des instances de om_edition
Modified: branches/4.5.0_OM_4.7_prop0006/obj/instruction.class.php
===================================================================
--- branches/4.5.0_OM_4.7_prop0006/obj/instruction.class.php 2017-10-13 11:18:49 UTC (rev 7565)
+++ branches/4.5.0_OM_4.7_prop0006/obj/instruction.class.php 2017-10-13 13:11:03 UTC (rev 7566)
@@ -5194,8 +5194,7 @@
}
$pdf_output = $pdf_lettre_rar->output("lettre_rar".date("dmYHis").".pdf","S");
- require_once PATH_OPENMAIRIE."om_edition.class.php";
- $om_edition = new om_edition();
+ $om_edition = $this->f->get_inst__om_edition();
$om_edition->expose_pdf_output($pdf_output, "lettre_rar".date("dmYHis").".pdf");
}
}
Modified: branches/4.5.0_OM_4.7_prop0006/tests/testGeneral.php
===================================================================
--- branches/4.5.0_OM_4.7_prop0006/tests/testGeneral.php 2017-10-13 11:18:49 UTC (rev 7565)
+++ branches/4.5.0_OM_4.7_prop0006/tests/testGeneral.php 2017-10-13 13:11:03 UTC (rev 7566)
@@ -251,8 +251,7 @@
$GLOBALS['f'] = $f;
$f->disableLog();
- require_once "../core/om_edition.class.php";
- $edition = new om_edition();
+ $edition = $f->get_inst__om_edition();
// Vérification du logo de collectivité mono dans le cas où :
// - un logo multi actif est défini
// - un logo actif pour la collectivité est défini