Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
mahara
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
mahara
mahara
Commits
7aedf73b
Commit
7aedf73b
authored
May 29, 2015
by
Aaron Wells
Committed by
Gerrit Code Review
May 29, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Escape institution_display_name correctly (Bug #1447377)"
parents
30ca3035
cc03fdc1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
htdocs/lib/db/upgrade.php
htdocs/lib/db/upgrade.php
+6
-0
htdocs/lib/institution.php
htdocs/lib/institution.php
+1
-1
htdocs/lib/version.php
htdocs/lib/version.php
+1
-1
No files found.
htdocs/lib/db/upgrade.php
View file @
7aedf73b
...
...
@@ -4066,5 +4066,11 @@ function xmldb_core_upgrade($oldversion=0) {
}
}
if
(
$oldversion
<
2015042800
)
{
require_once
(
get_config
(
'libroot'
)
.
'dwoo/dwoo/Dwoo/Core.php'
);
@
unlink
(
get_config
(
'dataroot'
)
.
'dwoo/compile/default'
.
get_config
(
'docroot'
)
.
'theme/raw/'
.
'templates/view/accesslistrow.tpl.d'
.
Dwoo_Core
::
RELEASE_TAG
.
'.php'
);
@
unlink
(
get_config
(
'dataroot'
)
.
'dwoo/compile/default'
.
get_config
(
'docroot'
)
.
'theme/raw/'
.
'templates/admin/users/accesslistitem.tpl.d'
.
Dwoo_Core
::
RELEASE_TAG
.
'.php'
);
}
return
$status
;
}
htdocs/lib/institution.php
View file @
7aedf73b
...
...
@@ -977,7 +977,7 @@ function build_institutions_html($filter, $showdefault, $query, $limit, $offset,
}
function
institution_display_name
(
$name
)
{
return
get_field
(
'institution'
,
'displayname'
,
'name'
,
$name
);
return
hsc
(
get_field
(
'institution'
,
'displayname'
,
'name'
,
$name
)
);
}
/**
...
...
htdocs/lib/version.php
View file @
7aedf73b
...
...
@@ -16,7 +16,7 @@ $config = new stdClass();
// See https://wiki.mahara.org/index.php/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config
->
version
=
201504
14
00
;
$config
->
version
=
201504
28
00
;
$config
->
series
=
'15.10'
;
$config
->
release
=
'15.10dev'
;
$config
->
minupgradefrom
=
2009022600
;
...
...
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