Merge 3.7

lib/classes/Browser.class.php

@@ -213,7 +213,7 @@ class Browser
      */
     public static function getInstance()
     {
-        if ( ! self::$_instance) {
+        if (!self::$_instance) {
             self::$_instance = new self();
         }
 
@@ -289,6 +289,16 @@ class Browser
         return $this->_is_html5;
     }
 
+    /**
+     * Return true is the browser support the HTML5 File API
+     *
+     * @return boolean
+     */
+    public function supportFileAPI()
+    {
+        return $this->_is_html5 && ($this->_browser_name !== self::BROWSER_IE || $this->_version >= 10);
+    }
+
     /**
      * Is the Browser very old  ?
      * @return boolean

lib/classes/appbox.class.php

@@ -388,11 +388,17 @@ class appbox extends base
          */
         $upgrader->set_current_message(_('Copying files'));
 
-        $origine = $registry->get('GV_RootPath') . 'config/custom_files/';
-        $target = $registry->get('GV_RootPath') . 'www/custom/';
-
         $filesystem = $core['file-system'];
-        $filesystem->mirror($origine, $target);
+
+        foreach (array(
+        'config/custom_files/' => 'www/custom/',
+        'config/minilogos/'    => 'www/custom/minilogos/',
+        'config/stamp/'        => 'www/custom/stamp/',
+        'config/status/'       => 'www/custom/status/',
+        'config/wm/'           => 'www/custom/wm/',
+        ) as $source => $target) {
+            $filesystem->mirror($registry->get('GV_RootPath') . $source, $registry->get('GV_RootPath') . $target);
+        }
 
         $upgrader->add_steps_complete(1);
 

lib/classes/module/console/systemUpgrade.class.php

@@ -58,12 +58,12 @@ class module_console_systemUpgrade extends Command
 
             if ($continue == 'y') {
                 try {
-                    $connexionInc = new \SplFileInfo($old_connexion_file, true);
-                    $configInc = new \SplFileInfo($old_config_file, true);
+                    $connexionInc = new \SplFileInfo($old_connexion_file);
+                    $configInc = new \SplFileInfo($old_config_file);
 
                     $Core->getConfiguration()->upgradeFromOldConf($configInc, $connexionInc);
                 } catch (\Exception $e) {
-
+                    throw new RuntimeException('Error while upgrading : ' . $e->getMessage());
                 }
             } else {
                 throw new RuntimeException('Phraseanet is not set up');

lib/classes/setup.class.php

@@ -39,7 +39,6 @@ class setup
         , "phrasea2"
         , "SimpleXML"
         , "sockets"
-        , "sqlite3"
         , "xml"
         , "zip"
         , "zlib"