Code updates and bug fixes for PHP 7.2 upgrade. Done #1973 @2.75

diff --git a/framework/application/controllers/AjaxController.php b/framework/application/controllers/AjaxController.php
index 97f874ff65b1b24803662c1652fd9f81f2438ecb..fb63dd1b99a07232a413e43dfa1e0d886ab5eaa5 100644 (file)
--- a/framework/application/controllers/AjaxController.php
+++ b/framework/application/controllers/AjaxController.php
@@ -16,8 +16,9 @@ class AjaxController extends CubeIT_Controller_AjaxController {
                if ($form->isValid($_POST)) {
                        $url = 'https://workshop.fluidbook.com/ajax/demandeDevis?devis_form=' . base64_encode(json_encode($_POST));
                        $xml = simplexml_load_file($url);
+                       $xml_alert = $xml->xpath('//alert');
 
-                       $okmessage = array_pop($xml->xpath('//alert'));
+                       $okmessage = array_pop($xml_alert);
                        if (null !== $okmessage) {
                                $okmessage = (string)$okmessage->content;
                        }

diff --git a/framework/application/views/scripts/templates/fonctionnalites.phtml b/framework/application/views/scripts/templates/fonctionnalites.phtml
index 8a245920a4c971339071a4725b52bbcfa713097d..9eafb377f49de6ef62543505fd846af2cc291341 100644 (file)
--- a/framework/application/views/scripts/templates/fonctionnalites.phtml
+++ b/framework/application/views/scripts/templates/fonctionnalites.phtml
@@ -26,4 +26,4 @@ $res .= $this->featuresSection($this->extras_title, $this->extras);
 \r
 $res .= $this->contactFooter();\r
 \r
-echo $res;
\ No newline at end of file
+echo $res;\r

diff --git a/js/410-features.js b/js/410-features.js
index b151db430da221d43b153d291afa11fd7059de13..7adf0217126cd458b9ea89814050d91e7674d9bc 100644 (file)
--- a/js/410-features.js
+++ b/js/410-features.js
@@ -78,4 +78,4 @@ function playVideo() {
     var video = $('.featherlight #introVideo iframe');
 
     video[0].src = video[0].src.replace('autoplay=0', 'autoplay=1');
-}
\ No newline at end of file
+}