Changeset 2773 for trunk/include/functions_html.inc.php

Timestamp:

Oct 18, 2008, 3:08:58 AM (16 years ago)

Author:

rvelices

Message:

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

File:

• trunk/include/functions_html.inc.php (modified) (2 diffs)

trunk/include/functions_html.inc.php

@@ -82 +82 @@
   $pages_around = $conf['paginate_pages_around'];
   $start_str = $clean_url ? '/start-' :
-    ( ( strstr($url, '?')===false ? '?':'&') . 'start=' );
+    ( ( strpos($url, '?')===false ? '?':'&') . 'start=' );
 
   $navbar = '';
@@ -782 +782 @@
 {
   global $conf;
-  if ( !( $conf['allow_html_descriptions'] and
-          preg_match('/<(div|br|img|script).*>/i', $desc) ) )
+  if ( !$conf['allow_html_descriptions'] )
   {
     $desc = nl2br($desc);