Changeset 12555

Timestamp:

Nov 5, 2011, 5:34:26 PM (12 years ago)

Author:

patdenice

Message:

merge r12553 from trunk to branch 2.3
feature:2322
feature:2493
Add a trigger for multi language tags in quick search and url

Location:

branches/2.3

Files:

• admin/include/functions.php (modified) (2 diffs)
• admin/tags.php (modified) (2 diffs)
• include/common.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)

branches/2.3/admin/include/functions.php

@@ -1451 +1451 @@
         array(
           'name' => $tag_name,
-          'url_name' => str2url($tag_name),
+          'url_name' => trigger_event('render_tag_url', $tag_name),
           )
         )
@@ -1726 +1726 @@
         array(
           'name' => $tag_name,
-          'url_name' => str2url($tag_name),
+          'url_name' => trigger_event('render_tag_url', $tag_name),
           )
         )

branches/2.3/admin/tags.php

@@ -85 +85 @@
             'id' => $tag_id,
             'name' => addslashes($tag_name),
-            'url_name' => str2url(trigger_event('render_tag_url', $tag_name)),
+            'url_name' => trigger_event('render_tag_url', $tag_name),
             )
           );
@@ -265 +265 @@
         array(
           'name' => $tag_name,
-          'url_name' => str2url(trigger_event('render_tag_url', $tag_name)),
+          'url_name' => trigger_event('render_tag_url', $tag_name),
           )
         )

branches/2.3/include/common.inc.php

@@ -279 +279 @@
 add_event_handler('render_comment_content', 'render_comment_content');
 add_event_handler('render_comment_author', 'strip_tags');
+add_event_handler('render_tag_url', 'str2url');
 add_event_handler('blockmanager_register_blocks', 'register_default_menubar_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL-1);
 trigger_action('init');

branches/2.3/index.php

@@ -215 +215 @@
       $hints[] =
         '<a href="' . make_index_url(array('tags'=>array($tag))) . '">'
-        .$tag['name']
+        .trigger_event('render_tag_name', $tag['name'])
         .'</a>';
     }