Fixed: Field::getInstance without module information

modules/Settings/LayoutEditor/actions/Field.php

@@ -58,7 +58,10 @@ class Settings_LayoutEditor_Field_Action extends Settings_Vtiger_Index_Action {
     public function save(Vtiger_Request $request) {
 		$currentUser = Users_Record_Model::getCurrentUserModel();
         $fieldId = $request->get('fieldid');
-        $fieldInstance = Settings_LayoutEditor_Field_Model::getInstance($fieldId);
+        $sourceModule = $request->get('sourceModule');
+
+        $moduleInstance = Vtiger_Module_Model::getInstance($sourceModule);
+        $fieldInstance = Settings_LayoutEditor_Field_Model::getInstance($fieldId, $moduleInstance);
         
         $fieldLabel = $fieldInstance->get('label');
         $mandatory = $request->get('mandatory',null);
@@ -212,4 +215,4 @@ class Settings_LayoutEditor_Field_Action extends Settings_Vtiger_Index_Action {
     public function validateRequest(Vtiger_Request $request) {
         $request->validateWriteAccess();
     }
-}
\ No newline at end of file
+}

vtlib/Vtiger/Field.php

@@ -214,7 +214,17 @@ class Vtiger_Field extends Vtiger_FieldBasic {
 	static function getInstance($value, $moduleInstance=false) {
 		global $adb;
 		$instance = false;
-		if (!$moduleInstance) return $instance;
+		if (!$moduleInstance) {
+			// Derive moduleInstance based on FieldId.
+			if (is_numeric($value)) {
+				$fieldInfo = Vtiger_Functions::getModuleFieldInfoWithId($value);
+				if ($fieldInfo) {
+					$moduleInstance = Vtiger_Module_Model::getInstance($fieldInfo["tabid"]);
+				} 
+			}
+		}
+		if (!$moduleInstance) return null;
+
 		$data = Vtiger_Functions::getModuleFieldInfo($moduleInstance->id, $value);
 		if ($data) {
             $instance = new self();
@@ -286,4 +296,4 @@ class Vtiger_Field extends Vtiger_FieldBasic {
 		self::log("Deleting fields of the module ... DONE");
 	}
 }
-?>
\ No newline at end of file
+?>