[Fusionforge-commits] r10466 - trunk/src/common/include

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Mon Sep 13 22:57:49 CEST 2010


Author: nerville
Date: 2010-09-13 22:57:48 +0200 (Mon, 13 Sep 2010)
New Revision: 10466

Modified:
   trunk/src/common/include/Group.class.php
   trunk/src/common/include/User.class.php
   trunk/src/common/include/utils.php
Log:
php warning

Modified: trunk/src/common/include/Group.class.php
===================================================================
--- trunk/src/common/include/Group.class.php	2010-09-13 20:46:42 UTC (rev 10465)
+++ trunk/src/common/include/Group.class.php	2010-09-13 20:57:48 UTC (rev 10466)
@@ -255,7 +255,7 @@
 			$this->setError(sprintf(_('fetchData():: %s'),db_error()));
 			return false;
 		}
-		$this->data_array =& db_fetch_array($res);
+		$this->data_array = db_fetch_array($res);
 		return true;
 	}
 

Modified: trunk/src/common/include/User.class.php
===================================================================
--- trunk/src/common/include/User.class.php	2010-09-13 20:46:42 UTC (rev 10465)
+++ trunk/src/common/include/User.class.php	2010-09-13 20:57:48 UTC (rev 10466)
@@ -1152,7 +1152,7 @@
 	 *	@return	string	This user's SSH authorized (public) keys.
 	 */
 	function getAuthorizedKeys() {
-		return ereg_replace("###", "\n", $this->data_array['authorized_keys']);
+		return preg_replace("/###/", "\n", $this->data_array['authorized_keys']);
 	}
 
 	/**

Modified: trunk/src/common/include/utils.php
===================================================================
--- trunk/src/common/include/utils.php	2010-09-13 20:46:42 UTC (rev 10465)
+++ trunk/src/common/include/utils.php	2010-09-13 20:57:48 UTC (rev 10466)
@@ -518,7 +518,7 @@
 	if(empty($data)) { 
 		return $data; 
 	}
-	$lines = split("\n",$data);
+	$lines = explode("\n",$data);
 	$newText = "";
 	while ( list ($key,$line) = each ($lines)) {
 		// When we come here, we usually have form input




More information about the Fusionforge-commits mailing list