From 23aea440d63f78c421508f785aff697a0bb7a556 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 19 Dec 2016 06:04:54 +0100 Subject: [PATCH 1/2] Fix: Travis --- htdocs/adherents/class/subscription.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php index 547265098be..733524e53c0 100644 --- a/htdocs/adherents/class/subscription.class.php +++ b/htdocs/adherents/class/subscription.class.php @@ -293,7 +293,6 @@ class Subscription extends CommonObject * Renvoi le libelle d'un statut donne * * @param int $statut Id statut - * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label */ function LibStatut($statut) From 9901aaa9fedd0d145d4dbab88336b7516b52acfb Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 19 Dec 2016 06:34:17 +0100 Subject: [PATCH 2/2] Try to correct travis public underscore problem --- htdocs/core/modules/import/modules_import.php | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index 20ce6ddc34d..cd70a3456bb 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -44,12 +44,12 @@ class ModeleImports public $version_lib; // Version of external lib used by driver // Array of all drivers - public $_driverlabel=array(); - public $_driverdesc=array(); - public $_driverversion=array(); + public $driverlabel=array(); + public $driverdesc=array(); + public $driverversion=array(); - public $_liblabel=array(); - public $_libversion=array(); + public $liblabel=array(); + public $libversion=array(); /** @@ -166,19 +166,19 @@ class ModeleImports // Picto $this->picto[$module->id]=$module->picto; // Driver properties - $this->_driverlabel[$module->id]=$module->getDriverLabel(''); - $this->_driverdesc[$module->id]=$module->getDriverDesc(''); - $this->_driverversion[$module->id]=$module->getDriverVersion(''); + $this->driverlabel[$module->id]=$module->getDriverLabel(''); + $this->driverdesc[$module->id]=$module->getDriverDesc(''); + $this->driverversion[$module->id]=$module->getDriverVersion(''); // If use an external lib - $this->_liblabel[$module->id]=$module->getLibLabel(''); - $this->_libversion[$module->id]=$module->getLibVersion(''); + $this->liblabel[$module->id]=$module->getLibLabel(''); + $this->libversion[$module->id]=$module->getLibVersion(''); $i++; } } } - return array_keys($this->_driverlabel); + return array_keys($this->driverlabel); } @@ -201,7 +201,7 @@ class ModeleImports */ function getDriverLabelForKey($key) { - return $this->_driverlabel[$key]; + return $this->driverlabel[$key]; } /** @@ -212,7 +212,7 @@ class ModeleImports */ function getDriverDescForKey($key) { - return $this->_driverdesc[$key]; + return $this->driverdesc[$key]; } /** @@ -223,7 +223,7 @@ class ModeleImports */ function getDriverVersionForKey($key) { - return $this->_driverversion[$key]; + return $this->driverversion[$key]; } /** @@ -234,7 +234,7 @@ class ModeleImports */ function getLibLabelForKey($key) { - return $this->_liblabel[$key]; + return $this->liblabel[$key]; } /** @@ -245,7 +245,7 @@ class ModeleImports */ function getLibVersionForKey($key) { - return $this->_libversion[$key]; + return $this->libversion[$key]; } }