From: stephen@cubedesigners.com Date: Tue, 6 Mar 2018 17:03:13 +0000 (+0000) Subject: Code updates and bug fixes for PHP 7.2 upgrade. Done #1973 @2.75 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4a9390a9d4bad04e5145535a6ded1e7c92a53db2;p=fluidbook-v3.git 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 97f874f..fb63dd1 100644 --- 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 8a24592..9eafb37 100644 --- 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); $res .= $this->contactFooter(); -echo $res; \ No newline at end of file +echo $res; diff --git a/js/410-features.js b/js/410-features.js index b151db4..7adf021 100644 --- 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 +}