Skip to content

Commit

Permalink
Merge branch '20.0' into 20_fixmigration
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy authored Jul 24, 2024
2 parents 4d4d325 + db7dbfb commit 259af92
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion htdocs/core/class/html.formmail.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2012,7 +2012,7 @@ class ModelMail extends CommonObject

// BEGIN MODULEBUILDER PROPERTIES
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
* @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
public $fields=array(

Check warning on line 2017 in htdocs/core/class/html.formmail.class.php

View workflow job for this annotation

GitHub Actions / phan / Run phan 

html.formmail.class.php: PhanTypeMismatchPropertyDefault: Default value for array&lt;string,array{type:string,label:string,enabled:int|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array&lt;int,string&gt;,comment?:string}&gt; $fields can't be ['rowid'=&gt;['type'=&gt;'integer','label'=&gt;'TechnicalID','enabled'=&gt;'1','position'=&gt;10,'notnull'=&gt;1,'visible'=&gt;'-1'],'module'=&gt;['type'=&gt;'varchar(32)','label'=&gt;'Module','enabled'=&gt;'1','position'=&gt;20,'notnull'=&gt;0,'visible'=&gt;'-1'],'type_template'=&gt;['type'=&gt;'varchar(32)','label'=&gt;'Typetemplate','enabled'=&gt;'1','position'=&gt;25,'notnull'=&gt;0,'visible'=&gt;'-1'],'lang'=&gt;['type'=&gt;'varchar(6)','label'=&gt;'Lang','enabled'=&gt;'1','position'=&gt;30,'notnull'=&gt;0,'visible'=&gt;'-1'],'private'=&gt;['type'=&gt;'smallint(6)','label'=&gt;'Private','enabled'=&gt;'1','position'=&gt;35,'notnull'=&gt;1,'visible'=&gt;'-1'],'fk_user'=&gt;['type'=&gt;'integer:User:user/class/user.class.php','label'=&gt;'Fkuser','enabled'=&gt;'1','position'=&gt;40,'notnull'=&gt;0,'visible'=&gt;'-1','css'=&gt;'maxwidth500 widthcentpercentminusxx','csslist'=&gt;'tdoverflowmax150'],'datec'=&gt;['type'=&gt;'datetime','label'=&gt;'DateCreation','enabled'=&gt;'1','position'=&gt;45,'notnull'=&gt;0,'visible'=&gt;'-1'],'tms'=&gt;['type'=&gt;'timestamp','label'=&gt;'DateModification','enabled'=&gt;'1','position'=&gt;50,'notnull'=&gt;1,'visible'=&gt;'-1'],'label'=&gt;['type'=&gt;'varchar(255)','label'=&gt;'Label','enabled'=&gt;'1','position'=&gt;55,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1','css'=&gt;'minwidth300','cssview'=&gt;'wordbreak','csslist'=&gt;'tdoverflowmax150'],'position'=&gt;['type'=&gt;'smallint(6)','label'=&gt;'Position','enabled'=&gt;'1','position'=&gt;60,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'active'=&gt;['type'=&gt;'integer','label'=&gt;'Active','enabled'=&gt;'1','position'=&gt;65,'notnull'=&gt;1,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'topic'=&gt;['type'=&gt;'text','label'=&gt;'Topic','enabled'=&gt;'1','position'=&gt;70,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'content'=&gt;['type'=&gt;'mediumtext','label'=&gt;'Content','enabled'=&gt;'1','position'=&gt;75,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'content_lines'=&gt;['type'=&gt;'text','label'=&gt;'Contentlines','enabled'=&gt;'1','position'=&gt;80,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'enabled'=&gt;['type'=&gt;'varchar(255)','label'=&gt;'Enabled','enabled'=&gt;'1','position'=&gt;85,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'joinfiles'=&gt;['type'=&gt;'varchar(255)','label'=&gt;'Joinfiles','enabled'=&gt;'1','position'=&gt;90,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'email_from'=&gt;['type'=&gt;'varchar(255)','label'=&gt;'Emailfrom','enabled'=&gt;'1','position'=&gt;95,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'email_to'=&gt;['type'=&gt;'varchar(255)','label'=&gt;'Emailto','enabled'=&gt;'1','position'=&gt;100,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'email_tocc'=&gt;['type'=&gt;'varchar(255)','label'=&gt;'Emailtocc','enabled'=&gt;'1','position'=&gt;105,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'email_tobcc'=&gt;['type'=&gt;'varchar(255)','label'=&gt;'Emailtobcc','enabled'=&gt;'1','position'=&gt;110,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1'],'defaultfortype'=&gt;['type'=&gt;'smallint(6)','label'=&gt;'Defaultfortype','enabled'=&gt;'1','position'=&gt;115,'notnull'=&gt;0,'visible'=&gt;'-1','alwayseditable'=&gt;'1']] of type array{rowid:array{type:'integer',label:'TechnicalID',enabled:'1',position:10,notnull:1,visible:'-1'},module:array{type:'varchar\x2832\x29',label:'Module',enabled:'1',position:20,notnull:0,visible:'-1'},type_template:array{type:'varchar\x2832\x29',label:'Typetemplate',enabled:'1',position:25,notnu
"rowid" => array("type"=>"integer", "label"=>"TechnicalID", "enabled"=>"1", 'position'=>10, 'notnull'=>1, "visible"=>"-1",),
Expand Down
5 changes: 3 additions & 2 deletions htdocs/product/card.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2121,7 +2121,7 @@
// Description (used in invoice, propal...)
print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';

// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
// We use dolibarr_details as type of DolEditor here, because we must not accept images, as description is included into PDF and external links are not accepted by TCPDF.
$doleditor = new DolEditor('desc', GETPOSTISSET('desc') ? GETPOST('desc', 'restricthtml') : $object->description, '', 160, 'dolibarr_details', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_DETAILS'), ROWS_4, '90%');
$doleditor->Create();

Expand Down Expand Up @@ -2643,7 +2643,8 @@
}

// Description
print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td class="wordbreakimp wrapimp">'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';
print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
print '<td class="wordbreakimp wrapimp"><div class="longmessagecut">'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</div></td></tr>';

// Public URL
if (!getDolGlobalString('PRODUCT_DISABLE_PUBLIC_URL')) {
Expand Down

0 comments on commit 259af92

Please sign in to comment.