(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index c08d364af1fdd8d7973fef1809834d75496ee666..865570c411bb92287ad851446e683fc5a40c2071 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -290,7 +290,8 @@ class wsUrl {
                }\r
                $res.='</ul>';\r
 \r
-               $phonegapVersions = array('2.8.1' => '2.8.1');\r
+               $v = wsHTML5Compiler::getPhonegapVersions();\r
+               $phonegapVersions = array_combine($v, $v);\r
 \r
                $res.='<h3>' . __('Paramètres avancés') . '</h3>';\r
                $res.='<table class="max">';\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 9df43eb9398ddb469dbee005f4cfc7dfc4cc327d..8d0a91b9b4ac757a4fecd58a487c249ea5f2d596 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -229,6 +229,11 @@ class wsHTML5Compiler {
                        return $v;
                }
 
+               $versions = self::getPhonegapVersions();
+               return array_pop($versions);
+       }
+
+       public static function getPhonegapVersions() {
                $versions = array();
 
                $dr = opendir(WS_COMPILE_ASSETS . '/_html5/js/libs/phonegap');
@@ -239,7 +244,8 @@ class wsHTML5Compiler {
                        $versions[] = $file;
                }
                usort($versions, 'version_compare');
-               return array_pop($versions);
+               $versions=array_reverse($versions, true);
+               return $versions;
        }
 
        public function getCssScale() {
@@ -550,7 +556,7 @@ class wsHTML5Compiler {
                        }
                }
 
-               $vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'description', 'print', 'hiddenContents', 'splash','cache');
+               $vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'description', 'print', 'hiddenContents', 'splash', 'cache');
                foreach ($vars as $v) {
                        $html = str_replace('<!-- $' . $v . ' -->', $$v, $html);
                }
@@ -578,7 +584,7 @@ class wsHTML5Compiler {
 
                $thtml = $uhtml;
 
-               $vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'print', 'hiddenContents', 'splash','cache');
+               $vars = array('titre', 'credits', 'ga', 'style', 'script', 'pagesContents', 'print', 'hiddenContents', 'splash', 'cache');
                foreach ($vars as $v) {
                        $uhtml = str_replace('<!-- $' . $v . ' -->', $$v, $uhtml);
                }