merge rev 2771,2772 from branch 2.0

- 2771 event tracer improvement: option to show all registered event handlers for every page
- 2772 php optims (small): remove/replace preg_xxx with faster simple string functions

git-svn-id: http://piwigo.org/svn/trunk@2773 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2008-10-18 01:08:58 +00:00
parent 90be9fbb84
commit 3326f742fe
6 changed files with 75 additions and 35 deletions
+3 -4
View File
@@ -81,7 +81,7 @@ function create_navigation_bar(
$pages_around = $conf['paginate_pages_around'];
$start_str = $clean_url ? '/start-' :
( ( strstr($url, '?')===false ? '?':'&') . 'start=' );
( ( strpos($url, '?')===false ? '?':'&') . 'start=' );
$navbar = '';
@@ -781,8 +781,7 @@ function set_status_header($code, $text='')
function render_category_description($desc)
{
global $conf;
if ( !( $conf['allow_html_descriptions'] and
preg_match('/<(div|br|img|script).*>/i', $desc) ) )
if ( !$conf['allow_html_descriptions'] )
{
$desc = nl2br($desc);
}
@@ -827,4 +826,4 @@ function register_default_menubar_blocks( $menu_ref_arr )
$menu->register_block( new RegisteredBlock( 'mbIdentification', 'identification', 'piwigo') );
}
?>
?>