Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fusiondirectory
fusiondirectory-plugins
Commits
71c831dd
Commit
71c831dd
authored
Jan 19, 2017
by
Benoit Mortier
Browse files
Merge branch '1.0.18-fixes'
parents
20c0279b
8bce5e35
Changes
3
Hide whitespace changes
Inline
Side-by-side
argonaut/addons/argonaut/deploy-list.xml
View file @
71c831dd
...
...
@@ -95,7 +95,7 @@
<type>
entry
</type>
<image>
geticon.php?context=actions
&
icon=process-stop
&
size=16
</image>
<label>
Abort
</label>
</action>
</action>
<action>
<type>
separator
</type>
...
...
mail/personal/mail/class_mail-methods.inc
View file @
71c831dd
...
...
@@ -427,7 +427,7 @@ class mailMethod
This function is mainly used to read and write folder permissions.
@return String A valid folder id
*/
public
function
create_folder_id
(
$folder
,
$type
=
""
)
public
function
create_folder_id
(
$folder
)
{
if
(
!
empty
(
$folder
))
{
$folder
=
trim
(
preg_replace
(
"/^INBOX[\.\/]*/i"
,
""
,
$folder
));
...
...
supann/admin/supannStructures/class_etablissement.inc
View file @
71c831dd
...
...
@@ -176,11 +176,11 @@ class etablissement extends simplePlugin
}
}
$root_mode
=
'add'
;
}
else
if
((
$root_code
!==
FALSE
)
&&
(
$root_code
==
$this
->
supannEtablissement
)
&&
$this
->
set_root
)
{
}
elseif
((
$root_code
!==
FALSE
)
&&
(
$root_code
==
$this
->
supannEtablissement
)
&&
$this
->
set_root
)
{
/* We are the root etablissement, we need to update it */
$root_attrs
=
$this
->
attrs
;
$root_mode
=
'modify'
;
}
else
if
((
$root_code
!==
FALSE
)
&&
(
$root_code
==
$this
->
supannEtablissement
)
&&
!
$this
->
set_root
)
{
}
elseif
((
$root_code
!==
FALSE
)
&&
(
$root_code
==
$this
->
supannEtablissement
)
&&
!
$this
->
set_root
)
{
/* We are the root etablissement, we want to delete it */
$root_mode
=
'delete'
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment