diff options
| author | rvelices <rv-github@modusoptimus.com> | 2008-10-18 01:08:58 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2008-10-18 01:08:58 +0000 |
| commit | 3326f742fe2a1745dc1ebdd060d023263af299b9 (patch) | |
| tree | b5ec4cadf5e37a39e83e978af1bd8da9d1c2dea9 /include/functions_html.inc.php | |
| parent | 90be9fbb84623095a360cfa6e9c1955a891eeba5 (diff) | |
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
Diffstat (limited to 'include/functions_html.inc.php')
| -rw-r--r-- | include/functions_html.inc.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 0a09ab31a..cb530749a 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -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') ); } -?> +?>
\ No newline at end of file |