mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2129 from owncloud/don't-sanitize-error-message 

Don't sanitize error message hint
This commit is contained in:
Bernhard Posselt 2013-03-06 04:19:55 -08:00
parent 145fb18042 cfb10dc58c
commit 3213331f73
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/error.php
View File

@ -2,7 +2,7 @@
<?php foreach($_["errors"] as $error):?>
<li class='error'>
<?php p($error['error']) ?><br/>
<p class='hint'><?php if(isset($error['hint']))p($error['hint']) ?></p>
<p class='hint'><?php if(isset($error['hint']))print_unescaped($error['hint']) ?></p>
</li>
<?php endforeach ?>
</ul>

5
lib/template.php
View File

@ -519,12 +519,13 @@ class OC_Template{
/**
* @brief Print a fatal error page and terminates the script
* @param string $error The error message to show
* @param string $hint An option hint message
* @param string $hint An optional hint message
* Warning: All data passed to $hint needs to get sanitized using OC_Util::sanitizeHTML
*/
public static function printErrorPage( $error_msg, $hint = '' ) {
$content = new OC_Template( '', 'error', 'error' );
$errors = array(array('error' => $error_msg, 'hint' => $hint));
$content->assign( 'errors', $errors, false );
$content->assign( 'errors', $errors );
$content->printPage();
die();
}