(no commit message)

diff --git a/.htaccess b/.htaccess
index 3c6a832d37d8b79bf531dea3320e6ea9d1390b7c..1d2e185b1d9ef8ab5a7428208c473fb781c82efb 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -45,8 +45,6 @@ AddCharset UTF-8 log
        RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L]\r
        RewriteRule ^telecharger/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telecharger/$1/$2/$3 [L]\r
        RewriteRule ^telechargerr/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telechargerr/$1/$2/$3 [L]\r
-       RewriteRule ^factures$ index.php/$1 [L]\r
-       RewriteRule ^devis$ index.php/$1 [L]\r
        RewriteRule ^([-,_a-zA-Z0-9/]+)$ index.php/$1 [L]\r
 \r
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewer/$1_$2_$3/index [L]\r

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 0b0f9cce3c1dce49792c6b9e7c82e56bc826494f..12b61454ef4c41d5871f138bcc42f24e96a419e3 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -55,7 +55,7 @@ class wsExporter {
                if ($os == 'ios') {
                        $phonegap->setDistantCompiler('paris.cubedesigners.com', 'vincent', 'iquique', '/Phonegap/Projects/' . $d, '/mnt/macbox/Phonegap/Projects/' . $d, 22022, SSH_KEY);
                } else if ($os == 'android') {
-                       $manifestType = $collection->settings['offline'] ? 'Offline' : 'Online';
+                       $manifestType = isset($collection->settings['offline']) ? 'Offline' : 'Online';
                        $phonegap->setManifest(WS_COMPILE_ASSETS . '/_html5app/_android/AndroidManifest' . $manifestType . '.xml');
                        $phonegap->setMain(WS_COMPILE_ASSETS . '/_html5app/_android/Main' . $manifestType . '.java');
                        $phonegap->setDistantCompiler('paris.cubedesigners.com', 'Vincent', 'iquique', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322, SSH_KEY);