Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
81a35256
Commit
81a35256
authored
Dec 07, 2006
by
Penny Leach
Browse files
fixed html escaping stuff in urls stored for activity
parent
0b72cd4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/activity.php
View file @
81a35256
...
...
@@ -123,7 +123,7 @@ function handle_activity($activitytype, $data) {
.
' '
.
get_string
(
'onview'
)
.
$viewtitle
;
}
else
{
$data
->
url
=
get_config
(
'wwwroot'
)
.
'view/artefact.php?id='
.
$data
->
artefact
.
'&
amp;
view='
.
$data
->
view
;
$data
->
url
=
get_config
(
'wwwroot'
)
.
'view/artefact.php?id='
.
$data
->
artefact
.
'&view='
.
$data
->
view
;
if
(
!
$artefacttitle
=
get_field
(
'artefact'
,
'title'
,
'id'
,
$data
->
artefact
))
{
throw
new
InvalidArgumentException
(
"Couldn't find artefact with id "
.
$data
->
view
);
}
...
...
@@ -181,11 +181,11 @@ function handle_activity($activitytype, $data) {
throw
new
InvalidArgumentException
(
"Couldn't find artefact with id "
.
$data
->
artefact
);
}
$userid
=
$artefact
->
owner
;
$data
->
subject
.
=
$artefact
->
title
;
$data
->
subject
.
=
' '
.
$artefact
->
title
;
if
(
empty
(
$data
->
url
))
{
// @todo this might change later
$data
->
url
=
get_config
(
'wwwroot'
)
.
'view/artefact.php?id='
.
$data
->
artefact
.
'&
amp;
view='
.
$data
->
view
;
.
$data
->
artefact
.
'&view='
.
$data
->
view
;
}
}
else
{
// feedback on view.
...
...
@@ -194,7 +194,7 @@ function handle_activity($activitytype, $data) {
throw
new
InvalidArgumentException
(
"Couldn't find view with id "
.
$data
->
view
);
}
$userid
=
$view
->
owner
;
$data
->
subject
.
=
$view
->
title
;
$data
->
subject
.
=
' '
.
$view
->
title
;
if
(
empty
(
$data
->
url
))
{
// @todo this might change later
$data
->
url
=
get_config
(
'wwwroot'
)
.
'view/view.php?id='
.
$data
->
view
;
...
...
@@ -260,7 +260,7 @@ function handle_activity($activitytype, $data) {
'
;
$users
=
get_records_sql_array
(
$sql
,
array
(
get_config
(
'wwwroot'
)
.
'view/artefact.php?id='
.
$data
->
artefact
.
'&
amp;
view='
,
'watchlist'
,
.
$data
->
artefact
.
'&view='
,
'watchlist'
,
$data
->
artefact
,
$data
->
artefact
));
if
(
empty
(
$users
))
{
$users
=
array
();
...
...
Write
Preview
Supports
Markdown
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