From: stephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 17 Nov 2017 10:47:40 +0000 (+0000)
Subject: Merge master changes to burgermenu branch.
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=59642f773e08f52e5435b166162cb3cd9702369b;p=cubeextranet.git

Merge master changes to burgermenu branch.
---

diff --git a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
index 8b99eaecf..ace9c99ca 100644
--- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
@@ -296,20 +296,12 @@ class wsHTML5Compiler {
 
 		$this->log('Start compile process');
 
-		// Copy fonts folder
-		$from = $this->assets . '/style/fonts';
-		$to = 'style/fonts';
-		$this->vdir->copyDirectory($from, $to);
-
-		// Copy images folder
-		$from = $this->assets . '/images';
-		$to = 'images';
-		$this->vdir->copyDirectory($from, $to);
-
-		// Copy images folder
-		$from = $this->assets . '/video';
-		$to = 'video';
-		$this->vdir->copyDirectory($from, $to);
+		// Raw copy of some directories
+		$directories = array('style/fonts', 'images', 'sound', 'video');
+		foreach ($directories as $directory) {
+			$from = $this->assets . '/' . $directory;
+			$this->vdir->copyDirectory($from, $directory);
+		}
 
 		$this->log('Copied assets');
 		$this->loadPlugins();
diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 96e12e789..ace9c99ca 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1562,4 +1562,4 @@ class wsHTML5Compiler {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index 86f1633a6..76305d856 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -1307,4 +1307,4 @@ class zoomLink extends normalLink {
 	public function getClasses() {
 		return array_merge(['zoomPopup'], parent::getClasses());
 	}
-}
\ No newline at end of file
+}