From 42dbf180800dac80aff22a62eceec291017f7bbd Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 20 Jun 2014 14:45:22 +0000 Subject: [PATCH] --- .htaccess | 2 -- inc/ws/Util/class.ws.exporter.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index 3c6a832d3..1d2e185b1 100644 --- a/.htaccess +++ b/.htaccess @@ -45,8 +45,6 @@ AddCharset UTF-8 log RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L] RewriteRule ^telecharger/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telecharger/$1/$2/$3 [L] RewriteRule ^telechargerr/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telechargerr/$1/$2/$3 [L] - RewriteRule ^factures$ index.php/$1 [L] - RewriteRule ^devis$ index.php/$1 [L] RewriteRule ^([-,_a-zA-Z0-9/]+)$ index.php/$1 [L] RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewer/$1_$2_$3/index [L] diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php index 0b0f9cce3..12b61454e 100644 --- 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); -- 2.39.5