Misc code improvements to fix errors in the logs.

diff --git a/inc/ws/Util/html5/class.ws.html5.php b/inc/ws/Util/html5/class.ws.html5.php
index dbfaba7e8ee1e4dad151ea880f1ab085530b3bc1..44fbb07d3364f8658155e380c00fcce032289014 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.php
+++ b/inc/ws/Util/html5/class.ws.html5.php
@@ -45,15 +45,19 @@ class wsHTML5 {
 \r
        public static function getPhonegapVersions() {\r
                $versions = array();\r
+        $phonegap_dir = WS_COMPILE_ASSETS . '/_html5/js/libs/phonegap';\r
+\r
+        if (is_dir($phonegap_dir)) {\r
+            $dr = opendir($phonegap_dir);\r
+            while ($file = readdir($dr)) {\r
+                if ($file == '.' || $file == '..' || $file == 'plugins') {\r
+                    continue;\r
+                }\r
+                $versions[] = $file;\r
+            }\r
+            usort($versions, 'version_compare');\r
+        }\r
 \r
-               $dr = opendir(WS_COMPILE_ASSETS . '/_html5/js/libs/phonegap');\r
-               while ($file = readdir($dr)) {\r
-                       if ($file == '.' || $file == '..' || $file == 'plugins') {\r
-                               continue;\r
-                       }\r
-                       $versions[] = $file;\r
-               }\r
-               usort($versions, 'version_compare');\r
                return $versions;\r
        }\r
 \r

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 af926a146e77e08c8de977edd7b23420f0e1b96a..2d0375a4c61575c44f07c745ecf3c33a796e6eca 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -11,7 +11,6 @@ class wsHTML5Compiler {
                'js/libs/fix/detect-zoom.js',
                'js/libs/cube/fb.js',
                'js/libs/cube/util.js',
-               'js/libs/fastclick/fastclick.js',
                'js/libs/json.js',
                'js/libs/flashdetect.js',
                'js/libs/screenfull.js',
@@ -463,7 +462,7 @@ class wsHTML5Compiler {
         $this->lessFilesExtras = array_unique(array_merge($this->lessFilesExtras, $extra_files));
        }
 
-       protected function writeIndex($numCSS) {
+       protected function writeIndex() {
                global $core;
 
                $html = file_get_contents($this->assets . '/_index.html');