Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
db116d05
Commit
db116d05
authored
7 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(smarty) Merge if statements (sonar fix)
issue
#5831
parent
ee7e6d40
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/smarty/plugins/block.render.php
+3
-4
contrib/smarty/plugins/block.render.php
with
3 additions
and
4 deletions
+3
-4
contrib/smarty/plugins/block.render.php
+
3
−
4
View file @
db116d05
...
@@ -43,10 +43,9 @@ function smarty_block_render($params, $text)
...
@@ -43,10 +43,9 @@ function smarty_block_render($params, $text)
}
}
/* Disable objects, but keep those active that have mode=read_active */
/* Disable objects, but keep those active that have mode=read_active */
if
(
!
(
isset
(
$params
[
'mode'
])
&&
(
$params
[
'mode'
]
==
'read_active'
)
&&
preg_match
(
'/(r|w)/'
,
$acl
)))
{
if
(
!
(
isset
(
$params
[
'mode'
])
&&
(
$params
[
'mode'
]
==
'read_active'
)
&&
preg_match
(
'/(r|w)/'
,
$acl
))
if
(
!
preg_match
(
'/ disabled(="disabled")?( |\/?>)/'
,
$text
))
{
&&
!
preg_match
(
'/ disabled(="disabled")?( |\/?>)/'
,
$text
))
{
$text
=
preg_replace
(
'/name=/i'
,
'disabled="disabled" name='
,
$text
);
$text
=
preg_replace
(
'/name=/i'
,
'disabled="disabled" name='
,
$text
);
}
}
}
/* Read only */
/* Read only */
...
...
This diff is collapsed.
Click to expand it.
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!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets