mirror of
https://github.com/YunoHost-Apps/framaforms_ynh.git
synced 2024-09-03 18:36:12 +02:00
Fix error
Error : Unsupported operand types dans FacesExtendable->extend() (ligne 233 dans /var/www/framaforms/sites/all/modules/rules/includes/faces.inc).
This commit is contained in:
parent
34023fb701
commit
4c2e0d934c
3 changed files with 19 additions and 1 deletions
|
@ -17,6 +17,10 @@ source /usr/share/yunohost/helpers
|
||||||
# MANAGE SCRIPT FAILURE
|
# MANAGE SCRIPT FAILURE
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
|
ynh_clean_setup () {
|
||||||
|
read -p "key"
|
||||||
|
true
|
||||||
|
}
|
||||||
# Exit if an error occurs during the execution of the script
|
# Exit if an error occurs during the execution of the script
|
||||||
ynh_abort_if_errors
|
ynh_abort_if_errors
|
||||||
|
|
||||||
|
@ -184,7 +188,7 @@ chown -R $app: $final_path
|
||||||
|
|
||||||
update-alternatives --set php /usr/bin/php7.3
|
update-alternatives --set php /usr/bin/php7.3
|
||||||
|
|
||||||
ynh_exec_as $app env PATH=$PATH drush @$app upwd --password="$password" "admin" 2>&1
|
ynh_exec_as $app env PATH=$PATH drush @$app user-password "admin" --password="$password" 2>&1
|
||||||
ynh_exec_as $app env PATH=$PATH drush @$app variable-set site_name "Framaforms" 2>&1
|
ynh_exec_as $app env PATH=$PATH drush @$app variable-set site_name "Framaforms" 2>&1
|
||||||
ynh_exec_as $app env PATH=$PATH drush @$app variable-set site_mail "no-reply@$domain" 2>&1
|
ynh_exec_as $app env PATH=$PATH drush @$app variable-set site_mail "no-reply@$domain" 2>&1
|
||||||
ynh_exec_as $app env PATH=$PATH drush @$app variable-set file_private_path "/home/yunohost.app/$app/data" 2>&1
|
ynh_exec_as $app env PATH=$PATH drush @$app variable-set file_private_path "/home/yunohost.app/$app/data" 2>&1
|
||||||
|
|
2
sources/patches/.gitignore
vendored
Normal file
2
sources/patches/.gitignore
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
*~
|
||||||
|
*.sw[op]
|
12
sources/patches/app-001-faces.patch
Normal file
12
sources/patches/app-001-faces.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/sites/all/modules/rules/includes/faces.inc b/sites/all/modules/rules/includes/faces.inc
|
||||||
|
index a1fc93bd..812d96a1 100644
|
||||||
|
--- a/sites/all/modules/rules/includes/faces.inc
|
||||||
|
+++ b/sites/all/modules/rules/includes/faces.inc
|
||||||
|
@@ -224,6 +224,7 @@ if (!class_exists('FacesExtendable', FALSE)) {
|
||||||
|
* describe a single file.
|
||||||
|
*/
|
||||||
|
public function extend($interface, array $callbacks = array(), array $includes = array()) {
|
||||||
|
+ $interface = class_exists($interface) ? $interface : FALSE;
|
||||||
|
$face_methods = $interface ? get_class_methods($interface) : array_keys($callbacks);
|
||||||
|
if ($interface) {
|
||||||
|
if (array_diff($face_methods, array_keys($callbacks))) {
|
Loading…
Reference in a new issue