Subversion Repositories eFlore/Applications.eflore-consultation

Compare Revisions

No changes between revisions

Regard whitespace Rev 1351 → Rev 1352

/trunk/modules/fiche/formateurs/Description.php
181,7 → 181,7
private function getCoste() {
$coste = array();
$this->textes->setProjet('coste');
$this->textes->setId('bdtfx.nn:'.$this->nomCourant->getNnr());
$this->textes->setId('bdtfx.nt:'.$this->nomCourant->getNt());
$texte = $this->textes->getTexte();
$texte = array_pop($texte['resultats']);
if ($texte) {
Property changes:
Added: svn:mergeinfo
Merged /branches/v5.4-decaisne/modules/fiche/formateurs/Description.php:r1226-1227
Merged /branches/v5.2-lasegue/modules/fiche/formateurs/Description.php:r1183
Merged /branches/v5.7-duchartre/modules/fiche/formateurs/Description.php:r1286,1294,1296,1325,1333-1334
Merged /branches/v5.3-cordier/modules/fiche/formateurs/Description.php:r1206
Merged /branches/v5.8-seynes/modules/fiche/formateurs/Description.php:r1344-1345,1347,1351