Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
9cb6ef53
Commit
9cb6ef53
authored
Sep 25, 2015
by
Robert Lyon
Committed by
Gerrit Code Review
Sep 25, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Ensure pieforms labels are always escaped (Bug #1496683)"
parents
6652660f
9a28149b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
7 deletions
+5
-7
htdocs/lang/en.utf8/mahara.php
htdocs/lang/en.utf8/mahara.php
+0
-1
htdocs/lib/form/elements/checkboxes.php
htdocs/lib/form/elements/checkboxes.php
+1
-1
htdocs/lib/form/elements/color.php
htdocs/lib/form/elements/color.php
+1
-1
htdocs/lib/pieforms/pieform.php
htdocs/lib/pieforms/pieform.php
+1
-1
htdocs/lib/pieforms/pieform/elements/date.php
htdocs/lib/pieforms/pieform/elements/date.php
+1
-1
htdocs/user/requestfriendship.php
htdocs/user/requestfriendship.php
+1
-2
No files found.
htdocs/lang/en.utf8/mahara.php
View file @
9cb6ef53
...
...
@@ -639,7 +639,6 @@ $string['email'] = 'Email';
$string
[
'emails'
]
=
'Emails'
;
$string
[
'subject'
]
=
'Subject'
;
$string
[
'message'
]
=
'Message'
;
$string
[
'messageoptional'
]
=
'Message <span class="accessible-hidden sr-only">(optional)</span>'
;
$string
[
'messagesent'
]
=
'Your message has been sent'
;
$string
[
'nosendernamefound'
]
=
'No sender name was submitted'
;
$string
[
'emailnotsent'
]
=
'Failed to send contact email. Error message: "%s"'
;
...
...
htdocs/lib/form/elements/checkboxes.php
View file @
9cb6ef53
...
...
@@ -33,7 +33,7 @@ function pieform_element_checkboxes(Pieform $form, $element) {/*{{{*/
$elementtitle
=
''
;
if
(
isset
(
$element
[
'title'
]))
{
$elementtitle
=
'<span class="accessible-hidden sr-only">'
.
$element
[
'title'
]
.
': </span>'
;
$elementtitle
=
'<span class="accessible-hidden sr-only">'
.
Pieform
::
hsc
(
$element
[
'title'
]
)
.
': </span>'
;
}
foreach
(
$element
[
'elements'
]
as
$e
)
{
...
...
htdocs/lib/form/elements/color.php
View file @
9cb6ef53
...
...
@@ -48,7 +48,7 @@ EOF;
$title
=
''
;
if
(
!
empty
(
$element
[
'title'
]))
{
$title
=
'<span class="accessible-hidden sr-only">'
.
$element
[
'title'
]
.
':</span>'
;
$title
=
'<span class="accessible-hidden sr-only">'
.
Pieform
::
hsc
(
$element
[
'title'
]
)
.
':</span>'
;
}
$optional
.
=
' <input type="checkbox" '
...
...
htdocs/lib/pieforms/pieform.php
View file @
9cb6ef53
...
...
@@ -1481,7 +1481,7 @@ EOF;
// Element title
if
(
isset
(
$element
[
'title'
])
&&
$element
[
'title'
]
!==
''
)
{
$title
=
(
!
empty
(
$element
[
'labelescaped'
]))
?
$element
[
'title'
]
:
self
::
hsc
(
$element
[
'title'
]);
$title
=
self
::
hsc
(
$element
[
'title'
]);
if
(
$this
->
get_property
(
'requiredmarker'
)
&&
!
empty
(
$element
[
'rules'
][
'required'
]))
{
$requiredmarker
=
' <span class="requiredmarker">*</span>'
;
...
...
htdocs/lib/pieforms/pieform/elements/date.php
View file @
9cb6ef53
...
...
@@ -72,7 +72,7 @@ EOF;
.
'tabindex="'
.
Pieform
::
hsc
(
$element
[
'tabindex'
])
.
'">'
;
$optional
.
=
' <label for="'
.
$name
.
'_optional">'
.
$form
->
i18n
(
'element'
,
'date'
,
'specify'
,
$element
)
.
': '
.
$element
[
'title'
]
.
'</label> '
;
.
Pieform
::
hsc
(
$element
[
'title'
]
)
.
'</label> '
;
$result
.
=
$optional
;
}
...
...
htdocs/user/requestfriendship.php
View file @
9cb6ef53
...
...
@@ -52,8 +52,7 @@ $form = pieform(array(
'elements'
=>
array
(
'message'
=>
array
(
'type'
=>
'textarea'
,
'title'
=>
get_string
(
'messageoptional'
),
'labelescaped'
=>
true
,
'title'
=>
get_string
(
'message'
),
'cols'
=>
50
,
'rows'
=>
4
,
'rules'
=>
array
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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