Skip to content

Commit

Permalink
Merge branch 'develop' into make_session_content_more_visible
Browse files Browse the repository at this point in the history
  • Loading branch information
evarisk-francois committed Jul 29, 2024
2 parents adc43e3 + ba02ebd commit dd5740a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions class/actions_dolimeet.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ class ActionsDolimeet
public array $results = [];

/**
* @var string String displayed by executeHook() immediately after return.
* @var string|null String displayed by executeHook() immediately after return.
*/
public string $resprints;
public ?string $resprints;

/**
* Constructor
Expand Down
2 changes: 1 addition & 1 deletion class/session.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Session extends SaturneObject
/**
* @var int Does object support extrafields ? 0 = No, 1 = Yes.
*/
public int $isextrafieldmanaged = 1;
public $isextrafieldmanaged = 1;

/**
* @var string Name of icon for session. Must be a 'fa-xxx' fontawesome code (or 'fa-xxx_fa_color_size') or 'session@dolimeet' if picto is file 'img/object_session.png'.
Expand Down

0 comments on commit dd5740a

Please sign in to comment.