From 295eabda2c5056acf320bff2bdd7d50c318af70c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 23 Jun 2021 23:38:09 +0200
Subject: [PATCH] Fix

---
 manifest.json   | 4 ----
 scripts/backup  | 1 +
 scripts/restore | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 34b47e9..d042a79 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,11 +14,7 @@
         "email": ""
     },
     "requirements": {
-<<<<<<< Updated upstream
         "yunohost": ">= 4.2.4"
-=======
-        "yunohost": ">= 4.2.0"
->>>>>>> Stashed changes
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/backup b/scripts/backup
index db7e199..c1b9d28 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -26,6 +26,7 @@ app=$YNH_APP_INSTANCE_NAME
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # STANDARD BACKUP STEPS
diff --git a/scripts/restore b/scripts/restore
index 8160cea..27c5321 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -28,6 +28,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED