* bugfix: modifications for PHP 7

franzholz · May 10, 2016 · e4cb31b · e4cb31b
1 parent 4948364
commit e4cb31b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git a/control/class.tx_ttproducts_activity_finalize.php b/control/class.tx_ttproducts_activity_finalize.php
@@ -37,7 +37,7 @@
  *
  */
 
-require_once (PATH_BE_ttproducts.'control/class.tx_ttproducts_activity_base.php');
+// require_once (PATH_BE_ttproducts.'control/class.tx_ttproducts_activity_base.php');
 
 
 class tx_ttproducts_activity_finalize extends tx_ttproducts_activity_base {
@@ -65,8 +65,7 @@ public function doProcessing (
 		$orderUid,
 		&$orderConfirmationHTML,
 		&$errorMessage,
-		$address,
-		&$mainMarkerArray
+		$address
 	)	{
 		global $TSFE;
 		global $TYPO3_DB;

diff --git a/control/class.tx_ttproducts_control.php b/control/class.tx_ttproducts_control.php
@@ -810,8 +810,7 @@ public function processActivities (
 					$orderUid,
 					$orderConfirmationHTML,
 					$errorMessage,
-					$infoViewObj,
-					$mainMarkerArray
+					$infoViewObj
 				);
 						// Important: 	 MUST come after the call of prodObj->getView, because this function, getView, calculates the order! And that information is used in the finalize-function
 				$contentTmp = $orderConfirmationHTML;

diff --git a/template/example_locallang_xml.html b/template/example_locallang_xml.html
@@ -32,7 +32,6 @@
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************
 
-$Id$
 -->
 
 </head>

diff --git a/template/products_css_variants_de.html b/template/products_css_variants_de.html
@@ -30,8 +30,6 @@
 *
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************
-
-$Id: products_css_variants_de.html 90302 2015-12-03 15:46:12Z franzholz $
 -->
 
 </head>
@@ -497,7 +495,7 @@ <h3>BASKET_TEMPLATE</h3>
 
 	<!-- ###display_variant5_giftService### -->
         <br />
-	Einzelprodukt, das über einen Geschenk-Service verpackt werden kann. ###PRODUCT_ADDITIONAL_GIFT_SERVICE###
+	Einzelprodukt, das über einen Geschenk-Service verpackt werden kann. ###PRODUCT_ADDITIONAL_GIFT_SERVICE###
 	<!-- ###display_variant5_giftService### -->
       </div>
       <div id="PRICE_TAX_BASKET2">
@@ -1445,7 +1443,7 @@ <h3>BASKET_REQUIRED_INFO_MISSING</h3>
 
 <div class="BASKET_REQUIRED_INFO_MISSING">
   Fehler bei der Eingabe<br />
-  <b>Sie haben nicht alle erforderlichen Felder mit Ihren Adressinformationen ausgefï¿½llt. Bitte gehen Sie zurï¿½ck und aktualisieren Ihre Eingaben.</b>
+  <b>Sie haben nicht alle erforderlichen Felder mit Ihren Adressinformationen ausgefï¿œllt. Bitte gehen Sie zurï¿œck und aktualisieren Ihre Eingaben.</b>
   <form method="post" action="###FORM_URL###">
   <input type="submit" id="button2" name="products_info" value="Adressdaten eingeben" onclick="document.forms[0].action='###FORM_URL_INFO###';">
   </form>

diff --git a/view/field/class.tx_ttproducts_field_base_view.php b/view/field/class.tx_ttproducts_field_base_view.php
@@ -36,7 +36,6 @@
  *
  */
 
-// require_once (PATH_BE_ttproducts.'view/field/interface.tx_ttproducts_field_view_int.php');
 
 
 abstract class tx_ttproducts_field_base_view implements tx_ttproducts_field_view_int	{
@@ -73,7 +72,6 @@ public function getRepeatedRowSubpartArrays (
 		$fieldname,
 		$key,
 		$value,
-		$fieldname,
 		$tableConf,
 		$tagArray
 	) {
@@ -164,7 +162,6 @@ public function getRepeatedSubpartArrays (
 						$fieldname,
 						$key,
 						$value,
-						$fieldname,
 						$tableConf,
 						$tagArray
 					);

diff --git a/view/field/class.tx_ttproducts_field_datafield_view.php b/view/field/class.tx_ttproducts_field_datafield_view.php
@@ -78,7 +78,6 @@ public function getRepeatedRowSubpartArrays (
 		$fieldname,
 		$key,
 		$value,
-		$fieldname,
 		$tableConf,
 		$tagArray
 	) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,6 @@ @@
     *  This copyright notice MUST APPEAR in all copies of the script!
     ***************************************************************
-    $Id$
     -->
     </head>
@@ Expand Down @@