Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master-2.21'
# Conflicts:
#	core/constant_inc.php
  • Loading branch information
dregad committed Aug 25, 2019
2 parents ad42c3c + bd094de commit 5f28f00
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/constant_inc.php
Expand Up @@ -21,7 +21,7 @@
/**
* Mantis Version
*/
define( 'MANTIS_VERSION', '2.22.0-dev' );
define( 'MANTIS_VERSION', '2.21.2' );
define( 'FILTER_VERSION', 'v9' );

# --- constants -------------------
Expand Down
14 changes: 14 additions & 0 deletions docbook/Admin_Guide/en-US/Revision_History.xml
Expand Up @@ -5,6 +5,20 @@
<title>Revision History</title>
<simpara>
<revhistory>
<revision>
<revnumber>2.21-2</revnumber>
<date>Mon Aug 19 2019</date>
<author>
<firstname>Victor</firstname>
<surname>Boctor</surname>
<email>vboctor@mantisbt.org</email>
</author>
<revdescription>
<simplelist>
<member>Release 2.21.2</member>
</simplelist>
</revdescription>
</revision>
<revision>
<revnumber>2.21-1</revnumber>
<date>Thu Jun 13 2019</date>
Expand Down
14 changes: 14 additions & 0 deletions docbook/Developers_Guide/en-US/Revision_History.xml
Expand Up @@ -7,6 +7,20 @@
<title>Revision History</title>
<simpara>
<revhistory>
<revision>
<revnumber>2.21-2</revnumber>
<date>Mon Aug 19 2019</date>
<author>
<firstname>Victor</firstname>
<surname>Boctor</surname>
<email>vboctor@mantisbt.org</email>
</author>
<revdescription>
<simplelist>
<member>Release 2.21.2</member>
</simplelist>
</revdescription>
</revision>
<revision>
<revnumber>2.21-1</revnumber>
<date>Thu Jun 13 2019</date>
Expand Down
2 changes: 1 addition & 1 deletion proj_doc_edit_page.php
Expand Up @@ -125,7 +125,7 @@
$t_href = '<a href="file_download.php?file_id='.$v_id.'&amp;type=doc">';
echo $t_href;
print_file_icon( $v_filename );
echo '</a>&#160;' . $t_href . file_get_display_name( $v_filename ) . '</a>';
echo '</a>&#160;' . $t_href . string_html_specialchars( file_get_display_name( $v_filename ) ) . '</a>';
?>
</td>
</tr>
Expand Down

0 comments on commit 5f28f00

Please sign in to comment.