Merge pull request #6196 from aspangaro/5.0-b12

Fix: Travis

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)

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];
 	}
 
 }