Index: class.tx_commerce_attributeeditor.php
===================================================================
--- class.tx_commerce_attributeeditor.php	(revision 47085)
+++ class.tx_commerce_attributeeditor.php	(working copy)
@@ -80,7 +80,7 @@
 		 * @author ingo schmitt <is@marketing-factory.de>
 		 */
 		 
-		$getPostedit=t3lib_div::GParrayMerged('edit');
+		$getPostedit=t3lib_div::_GPmerged('edit');
 		if (is_array($getPostedit['tx_commerce_articles']))	{
 			$articleUid = array_keys($getPostedit['tx_commerce_articles']);
 			if ($articleUid[0] > 0)	{
Index: hooks/class.tx_commerce_cmhooks.php
===================================================================
--- hooks/class.tx_commerce_cmhooks.php	(revision 47085)
+++ hooks/class.tx_commerce_cmhooks.php	(working copy)
@@ -149,7 +149,7 @@
 		global $BE_USER;
 			
 			// update the page tree
-		t3lib_BEfunc::getSetUpdateSignal('updatePageTree');
+		t3lib_BEfunc::setUpdateSignal('updatePageTree');
 		
 		/**
 		 * Delete all categories->products->articles if a category should be deleted.
Index: hooks/class.tx_commerce_dmhooks.php
===================================================================
--- hooks/class.tx_commerce_dmhooks.php	(revision 47085)
+++ hooks/class.tx_commerce_dmhooks.php	(working copy)
@@ -1159,7 +1159,7 @@
 		if (t3lib_div::int_from_ver(TYPO3_version) >= '4002000') { 	
 			t3lib_BEfunc::setUpdateSignal('updatePageTree');
 		}else{
-			t3lib_BEfunc::getSetUpdateSignal('updatePageTree');
+			t3lib_BEfunc::setUpdateSignal('updatePageTree');
 		}
 		
 		$loadDynaFlex = true;
Index: lib/class.tx_commerce_db_list.php
===================================================================
--- lib/class.tx_commerce_db_list.php	(revision 47085)
+++ lib/class.tx_commerce_db_list.php	(working copy)
@@ -452,7 +452,7 @@
 						$tce->process_cmdmap();
 	
 						if (isset($cmd['pages']))	{
-							t3lib_BEfunc::getSetUpdateSignal('updatePageTree');
+							t3lib_BEfunc::setUpdateSignal('updatePageTree');
 						}
 	
 						$tce->printLogErrorMessages(t3lib_div::getIndpEnv('REQUEST_URI'));
Index: lib/class.tx_commerce_navigation.php
===================================================================
--- lib/class.tx_commerce_navigation.php	(revision 47085)
+++ lib/class.tx_commerce_navigation.php	(working copy)
@@ -124,7 +124,7 @@
 		$this->nodeArrayAdditionalFields = t3lib_div::trimExplode(',',$this->mConf['additionalFields'],0);
 		
 		$this->PID = $this->mConf['overridePid'] ? $this->mConf['overridePid'] : $GLOBALS['TSFE']->id;
-		$this->gpVars = t3lib_div::GParrayMerged('tx_commerce_pi1');
+		$this->gpVars = t3lib_div::_GPmerged('tx_commerce_pi1');
 		
 		tx_commerce_div::initializeFeUserBasket();
 		
@@ -948,7 +948,7 @@
 	
 		$this->mConf = $this->processConf($conf);
 		$this->PID =  intval($this->mConf['overridePid'] ? $this->mConf['overridePid'] : $GLOBALS['TSFE']->id);   
-		$this->gpVars = t3lib_div::GParrayMerged('tx_commerce_pi1');
+		$this->gpVars = t3lib_div::_GPmerged('tx_commerce_pi1');
 		
 		tx_commerce_div::initializeFeUserBasket();
 		
Index: mod_cce/tx_commerce_cce_db.php
===================================================================
--- mod_cce/tx_commerce_cce_db.php	(revision 47085)
+++ mod_cce/tx_commerce_cce_db.php	(working copy)
@@ -409,7 +409,7 @@
 		
 		// Update page tree?
 		if ($this->uPT && (isset($this->data['pages'])||isset($this->cmd['pages'])))	{
-			t3lib_BEfunc::getSetUpdateSignal('updatePageTree');
+			t3lib_BEfunc::setUpdateSignal('updatePageTree');
 		}
 	}
 
Index: pi3/class.tx_commerce_pi3.php
===================================================================
--- pi3/class.tx_commerce_pi3.php	(revision 47085)
+++ pi3/class.tx_commerce_pi3.php	(working copy)
@@ -1962,7 +1962,7 @@
 				}
 			}
 
-			if ($userMail != '' && $this->cObj->checkEmail($userMail)) {
+			if ($userMail != '' && t3lib_div::validEmail($userMail)) {
 				$UserMailObj = t3lib_div::makeInstance('tx_commerce_pi3');
 				$UserMailObj->conf = $this->conf;
 				$UserMailObj->pi_setPiVarDefaults();