mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-08-11 03:03:01 +02:00
fix: remote site decodes html entities from xml and addslashes
fix: picture displays "image rank/total" images even for non numeric categories fix: category comment not transformed with nl2br if allow_html_descriptions and comment already looks like html git-svn-id: http://piwigo.org/svn/trunk@1046 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -160,7 +160,12 @@ SELECT '.implode(',', $infos).'
|
||||
$cat[$info] = get_boolean( $cat[$info] );
|
||||
}
|
||||
}
|
||||
$cat['comment'] = nl2br($cat['comment']);
|
||||
global $conf;
|
||||
if ( !( $conf['allow_html_descriptions'] and
|
||||
preg_match('/<(div|br|img).*>/i', $cat['comment']) ) )
|
||||
{
|
||||
$cat['comment'] = nl2br($cat['comment']);
|
||||
}
|
||||
|
||||
$names = array();
|
||||
$query = '
|
||||
|
||||
Reference in New Issue
Block a user