Changeset 7278


Ignore:
Timestamp:
Oct 19, 2010, 7:07:01 PM (10 years ago)
Author:
Eric
Message:

Merge from Trunk to Branch 2.15

Location:
extensions/NBC_UserAdvManager/branches/2.15
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/branches/2.15/ConfirmMail.php

    r6787 r7278  
    44
    55include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
     6include_once( PHPWG_ROOT_PATH.'include/functions_mail.inc.php' );
    67
    78include_once (UAM_PATH.'include/constants.php');
     
    6263    else $custom_text = l10n($conf_UAM_ConfirmMail[5]);
    6364
    64     if (isset($conf_UAM[21]) and $conf_UAM[21] == 'true')
    65     {
    66       $user_idsOK = array();
    67       if (!check_consult($userid, $user_idsOK))
    68       {
    69         $redirect = true;
    70       }
    71     }
     65    $redirect = true;
    7266   
    7367    $template->assign(
     
    8276  {
    8377    $status = false;
     78    $redirect = false;
    8479    if (function_exists('get_user_language_desc'))
    8580    {
     
    9186                        array(
    9287        'REDIRECT'             => $redirect,
     88        'GALLERY_URL'          => make_index_url(),
    9389        'STATUS'               => $status,
    9490                                'CONFIRM_MAIL_MESSAGE' => $custom_text,
     
    105101}
    106102
    107 if ( isset($conf['gallery_url']) )
    108 {
    109         $template->assign(
    110                 array(
    111         'GALLERY_URL' =>
    112                 isset($page['gallery_url']) ?
    113                         $page['gallery_url'] : $conf['gallery_url'],
    114                 )
    115         );
    116 }
    117 
    118103$template->set_filenames(
    119104  array(
  • extensions/NBC_UserAdvManager/branches/2.15/admin/template/uam.css

    r6823 r7278  
    9797  text-align:center;
    9898}
     99
     100#pager img {
     101  margin-bottom: -3px;
     102}
  • extensions/NBC_UserAdvManager/branches/2.15/changelog.txt.php

    r7000 r7278  
    198198
    199199-- 2.15.7 : Bug 1869 fixed - Compatibility with Adult_Content installation process
     200
     201-- 2.15.8 : Bug 1935 fixed - Fatal error on ConfirmMail page when Extended Description plugin is not used
     202            Bug 1936 fixed - Bad home link in ConfirmMail page when gallery URL is not set
     203            small CSS improvement (thx to Gotcha)
    200204*/
    201205?>
  • extensions/NBC_UserAdvManager/branches/2.15/main.inc.php

    r7000 r7278  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.15.7
     4Version: 2.15.8
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
  • extensions/NBC_UserAdvManager/branches/2.15/template/ConfirmMail.tpl

    r6787 r7278  
    1010        </a>
    1111    {else}
    12       {if isset($GALLERY_URL)}
    1312        <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
    1413          <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    1514        </a>
    16       {else}
    17         <a href="{$U_HOME}" title="{'return to homepage'|@translate}">
    18           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    19         </a>
    20       {/if}
    2115    {/if}
    2216      </li>
Note: See TracChangeset for help on using the changeset viewer.