Ignore:
Timestamp:
Feb 12, 2011, 3:58:00 PM (13 years ago)
Author:
Eric
Message:

r9197 merged from trunk to branch 2.20

File:
1 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/branches/2.20/include/functions.inc.php

    r9178 r9198  
    658658  if (isset($conf_UAM[29]) and $conf_UAM[29] == 'true')
    659659  {
    660     // Management of Extension flags ([username], [mygallery])
     660    // Management of Extension flags ([username], [mygallery], [myurl])
    661661    $patterns[] = '#\[username\]#i';
    662662    $replacements[] = stripslashes($row['username']);
    663663    $patterns[] = '#\[mygallery\]#i';
    664664    $replacements[] = $conf['gallery_title'];
     665    $patterns[] = '#\[myurl\]#i';
     666    $replacements[] = $conf['gallery_url'];
    665667   
    666668    $infos = preg_replace($patterns, $replacements, $conf_UAM[30])."\n"."\n".$infos;
    … …  
    746748      if (isset($conf_UAM[9]) and $conf_UAM[9] <> '')
    747749      {
    748         // Management of Extension flags ([username], [mygallery])
     750        // Management of Extension flags ([username], [mygallery], [myurl])
    749751        $patterns[] = '#\[username\]#i';
    750752        $replacements[] = $username;
    751753        $patterns[] = '#\[mygallery\]#i';
    752754        $replacements[] = $conf['gallery_title'];
     755        $patterns[] = '#\[myurl\]#i';
     756        $replacements[] = $conf['gallery_url'];
    753757   
    754758        if (function_exists('get_user_language_desc'))
    … …  
    796800    if (isset($conf_UAM[10]) and $conf_UAM[10] <> '')
    797801    {
    798       // Management of Extension flags ([username], [mygallery])
     802      // Management of Extension flags ([username], [mygallery], [myurl])
    799803      $patterns[] = '#\[username\]#i';
    800804      $replacements[] = $username;
    801805      $patterns[] = '#\[mygallery\]#i';
    802806      $replacements[] = $conf['gallery_title'];
     807      $patterns[] = '#\[myurl\]#i';
     808      $replacements[] = $conf['gallery_url'];
    803809     
    804810      if (function_exists('get_user_language_desc'))
    … …  
    892898      if (isset($conf_UAM_ConfirmMail[2]) and $conf_UAM_ConfirmMail[2] <> '' and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and $confirm)
    893899      {
    894         // Management of Extension flags ([username], [mygallery])
     900        // Management of Extension flags ([username], [mygallery], [myurl])
    895901        $patterns[] = '#\[username\]#i';
    896902        $replacements[] = $username;
    897903        $patterns[] = '#\[mygallery\]#i';
    898904        $replacements[] = $conf['gallery_title'];
     905        $patterns[] = '#\[myurl\]#i';
     906        $replacements[] = $conf['gallery_url'];
    899907
    900908        if (function_exists('get_user_language_desc'))
    … …  
    926934      if (isset($conf_UAM_ConfirmMail[4]) and $conf_UAM_ConfirmMail[4] <> '' and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and !$confirm)
    927935      {
    928         // Management of Extension flags ([username], [mygallery])
     936        // Management of Extension flags ([username], [mygallery], [myurl])
    929937        $patterns[] = '#\[username\]#i';
    930938        $replacements[] = $username;
    931939        $patterns[] = '#\[mygallery\]#i';
    932940        $replacements[] = $conf['gallery_title'];
     941        $patterns[] = '#\[myurl\]#i';
     942        $replacements[] = $conf['gallery_url'];
    933943       
    934944        if (function_exists('get_user_language_desc'))
    … …  
    10031013  if (isset($conf_UAM[18]) and $conf_UAM[18] <> '' and isset($conf_UAM[16]) and $conf_UAM[16] == 'true')
    10041014  {
    1005     // Management of Extension flags ([username], [mygallery])
     1015    // Management of Extension flags ([username], [mygallery], [myurl])
    10061016    $patterns[] = '#\[username\]#i';
    10071017    $replacements[] = $username;
    10081018    $patterns[] = '#\[mygallery\]#i';
    10091019    $replacements[] = $conf['gallery_title'];
     1020    $patterns[] = '#\[myurl\]#i';
     1021    $replacements[] = $conf['gallery_url'];
    10101022
    10111023    if (function_exists('get_user_language_desc'))
    … …  
    10831095  if (isset($conf_UAM[25]) and $conf_UAM[25] <> '')
    10841096  {
    1085     // Management of Extension flags ([username], [mygallery])
     1097    // Management of Extension flags ([username], [mygallery], [myurl])
    10861098    $patterns[] = '#\[username\]#i';
    10871099    $replacements[] = $username;
    10881100    $patterns[] = '#\[mygallery\]#i';
    10891101    $replacements[] = $conf['gallery_title'];
     1102    $patterns[] = '#\[myurl\]#i';
     1103    $replacements[] = $conf['gallery_url'];
    10901104
    10911105    if (function_exists('get_user_language_desc'))
    … …  
    11801194  if (isset($conf_UAM[28]) and $conf_UAM[28] <> '')
    11811195  {
    1182     // Management of Extension flags ([username], [mygallery])
     1196    // Management of Extension flags ([username], [mygallery], [myurl])
    11831197    $patterns[] = '#\[username\]#i';
    11841198    $replacements[] = $username;
    11851199    $patterns[] = '#\[mygallery\]#i';
    11861200    $replacements[] = $conf['gallery_title'];
     1201    $patterns[] = '#\[myurl\]#i';
     1202    $replacements[] = $conf['gallery_url'];
    11871203
    11881204    if (function_exists('get_user_language_desc'))
Note: See TracChangeset for help on using the changeset viewer.