[Noalyss-commit] [noalyss] 321/323: Improve upgradeCore

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit db94488ecd50ad7b37f72a6629f89b09f6706952
Author: Dany De Bontridder <address@hidden>
Date:   Mon Mar 12 22:57:07 2018 +0100

    Improve upgradeCore
---
 include/ajax/ajax_admin.php          | 5 ++++-
 include/class/package_core.class.php | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/ajax/ajax_admin.php b/include/ajax/ajax_admin.php
index 1cf727d..30d6e7b 100644
--- a/include/ajax/ajax_admin.php
+++ b/include/ajax/ajax_admin.php
@@ -354,7 +354,7 @@ if ($op=='upgradeCore')
         $progress->set_value(5);
         $core->download();
         $progress->set_value(55);
-        if (!DEBUG)
+        if (!DEBUG )
         {
             $core->install();
         }
@@ -364,7 +364,10 @@ if ($op=='upgradeCore')
         printf(_("Afin de terminer l'installation aller sur %s , à la fin de 
la procédure , demandez à effacer le fichier install.php"),
                 $url);
     } catch (Exception $ex ) {
+        echo '<p class="notice">';
         echo $ex->getMessage();
+        echo '</p>';
+        $progress->set_value(100);
     }
     return;
 }
diff --git a/include/class/package_core.class.php 
b/include/class/package_core.class.php
index db2a86b..45a167b 100644
--- a/include/class/package_core.class.php
+++ b/include/class/package_core.class.php
@@ -39,6 +39,7 @@ class Package_Core extends Package_Noalyss
         if ( !is_writable(NOALYSS_INCLUDE)) {
             return 0;
         }
+        return 1;
     }
 
     /**