diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3f365a8bf99..418c5b10213 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3828,7 +3828,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
$out .= $langs->trans("InformationToHelpDiagnose").":
\n";
$out .= "".$langs->trans("Date").": ".dol_print_date(time(), 'dayhourlog')."
\n";
- $out .= "".$langs->trans("Dolibarr").": ".DOL_VERSION."
\n";
+ $out .= "".$langs->trans("Dolibarr").": ".DOL_VERSION." - https://www.dolibarr.org
\n";
if (isset($conf->global->MAIN_FEATURES_LEVEL)) $out .= "".$langs->trans("LevelOfFeature").": ".$conf->global->MAIN_FEATURES_LEVEL."
\n";
if (function_exists("phpversion"))
{
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 36db624fc8d..d68cc5a66da 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -181,7 +181,7 @@ class MyObject extends CommonObject
//public $table_element_line = 'mymodule_myobjectline';
/**
- * @var int Field with ID of parent key if this field has a parent
+ * @var int Field with ID of parent key if this object has a parent
*/
//public $fk_element = 'fk_myobject';
@@ -193,12 +193,12 @@ class MyObject extends CommonObject
/**
* @var array List of child tables. To test if we can delete object.
*/
- //protected $childtables=array();
+ //protected $childtables = array();
/**
* @var array List of child tables. To know object to delete on cascade.
*/
- //protected $childtablesoncascade=array('mymodule_myobjectdet');
+ //protected $childtablesoncascade = array('mymodule_myobjectdet');
/**
* @var MyObjectLine[] Array of subtable lines
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index c344838458d..b77dc86765c 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -146,11 +146,11 @@ div.mainmenu.generic4::before {
/* Define color of some picto */
.fa-phone, .fa-mobile-alt, .fa-fax {
- opacity: 0.5;
+ opacity: 0.7;
color: #440;
}
.fa-at, .fa-external-link-alt {
- opacity: 0.5;
+ opacity: 0.7;
color: #304;
}
.fa-trash {
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 3effe5ccd6e..0eddbc87b18 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -49,6 +49,7 @@ class WebsitePage extends CommonObject
*/
public $picto = 'file-code';
+
/**
* @var int ID
*/
@@ -164,6 +165,35 @@ class WebsitePage extends CommonObject
// END MODULEBUILDER PROPERTIES
+ // If this object has a subtable with lines
+
+ /**
+ * @var int Name of subtable line
+ */
+ //public $table_element_line = 'mymodule_myobjectline';
+
+ /**
+ * @var int Field with ID of parent key if this object has a parent
+ */
+ public $fk_element = 'fk_website';
+
+ /**
+ * @var int Name of subtable class that manage subtable lines
+ */
+ //public $class_element_line = 'MyObjectline';
+
+ /**
+ * @var array List of child tables. To test if we can delete object.
+ */
+ //protected $childtables=array();
+
+ /**
+ * @var array List of child tables. To know object to delete on cascade.
+ */
+ protected $childtablesoncascade = array('categorie_website_page');
+
+
+
/**
* Constructor
*
@@ -522,9 +552,33 @@ class WebsitePage extends CommonObject
*/
public function delete(User $user, $notrigger = false)
{
- $result = $this->deleteCommon($user, $trigger);
+ $error = 0;
- if ($result > 0)
+ // Delete all child tables
+ if (!$error) {
+ foreach ($this->childtablesoncascade as $table)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
+ $sql .= " WHERE fk_website_page = ".(int) $this->id;
+
+ $result = $this->db->query($sql);
+ if (!$result) {
+ $error++;
+ $this->errors[] = $this->db->lasterror();
+ break;
+ }
+ }
+ }
+
+ if (!$error) {
+ $result = $this->deleteCommon($user, $trigger);
+ if ($result > 0)
+ {
+ $error++;
+ }
+ }
+
+ if (!$error)
{
$websiteobj = new Website($this->db);
$result = $websiteobj->fetch($this->fk_website);