Merge remote-tracking branch 'origin/3.4' into 3.4_backported

Dolibarr · Jan 6, 2014 · 376067b · 376067b
2 parents 5d1fcb2 + 5b63b56
commit 376067b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -155,6 +155,7 @@ backport commit 384e3812eb73a15adafb472cacfb93397a54459b to fix W3C/edit contrac
 
 
 ***** ChangeLog for 3.3.5 compared to 3.3.4 *****
+- Fix: Change to make debian package ok despite removal of ckeditor.
 - Fix: jcrop file to match debian rules
 - Fix: Add missing country UK.
 - Fix: Minor fix into package.

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
@@ -152,7 +152,8 @@
     					$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
     					if ($objMod->version == 'development'  && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified=0;
     					if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified=0;
-						//if ($mode == 'expdev' && ($objMod->version != 'experimental' && $objMod->version != 'development')) $modulequalified=0;
+						// We discard modules according to property disabled
+    					if (! empty($objMod->hidden)) $modulequalified=false;
 
     					// Define array $categ with categ with at least one qualified module
     					if ($modulequalified)

diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
@@ -62,6 +62,8 @@ function __construct($db)
 		$this->config_page_url = array("fckeditor.php");
 
 		// Dependances
+		global $dolibarr_js_CKEDITOR;
+		$this->hidden = ($dolibarr_js_CKEDITOR == 'disabled'?1:0);	// A condition to disable module (used for native debian packages)
 		$this->depends = array();
 		$this->requiredby = array();