Changeset 12555


Ignore:
Timestamp:
11/05/11 17:34:26 (8 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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.3/admin/include/functions.php

    r12259 r12555  
    14511451        array( 
    14521452          'name' => $tag_name, 
    1453           'url_name' => str2url($tag_name), 
     1453          'url_name' => trigger_event('render_tag_url', $tag_name), 
    14541454          ) 
    14551455        ) 
     
    17261726        array( 
    17271727          'name' => $tag_name, 
    1728           'url_name' => str2url($tag_name), 
     1728          'url_name' => trigger_event('render_tag_url', $tag_name), 
    17291729          ) 
    17301730        ) 
  • branches/2.3/admin/tags.php

    r12032 r12555  
    8585            'id' => $tag_id, 
    8686            'name' => addslashes($tag_name), 
    87             'url_name' => str2url(trigger_event('render_tag_url', $tag_name)), 
     87            'url_name' => trigger_event('render_tag_url', $tag_name), 
    8888            ) 
    8989          ); 
     
    265265        array( 
    266266          'name' => $tag_name, 
    267           'url_name' => str2url(trigger_event('render_tag_url', $tag_name)), 
     267          'url_name' => trigger_event('render_tag_url', $tag_name), 
    268268          ) 
    269269        ) 
  • branches/2.3/include/common.inc.php

    r11587 r12555  
    279279add_event_handler('render_comment_content', 'render_comment_content'); 
    280280add_event_handler('render_comment_author', 'strip_tags'); 
     281add_event_handler('render_tag_url', 'str2url'); 
    281282add_event_handler('blockmanager_register_blocks', 'register_default_menubar_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL-1); 
    282283trigger_action('init'); 
  • branches/2.3/index.php

    r8728 r12555  
    215215      $hints[] = 
    216216        '<a href="' . make_index_url(array('tags'=>array($tag))) . '">' 
    217         .$tag['name'] 
     217        .trigger_event('render_tag_name', $tag['name']) 
    218218        .'</a>'; 
    219219    } 
Note: See TracChangeset for help on using the changeset viewer.