Changeset 9545 for branches/2.1


Ignore:
Timestamp:
Mar 5, 2011, 5:16:53 PM (13 years ago)
Author:
patdenice
Message:

merge r9544 form trunk to branch 2.1
bug:2212
Update header message when gallery is locked or unlocked.

Location:
branches/2.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1

    • Property svn:mergeinfo changed
      /trunkmerged: 9544
  • branches/2.1/admin/configuration.php

    r6410 r9545  
    115115    case 'main' :
    116116    {
     117      if (empty($_POST['gallery_locked']) and $conf['gallery_locked'])
     118      {
     119        $tpl_var = & $template->get_template_vars('header_msgs');
     120        $msg_key = array_search(l10n('The gallery is locked for maintenance. Please, come back later.'), $tpl_var);
     121        unset($tpl_var[$msg_key]);
     122      }
     123      elseif (!empty($_POST['gallery_locked']) and !$conf['gallery_locked'])
     124      {
     125        $template->append('header_msgs', l10n('The gallery is locked for maintenance. Please, come back later.'));
     126      }
    117127      foreach( $main_checkboxes as $checkbox)
    118128      {
Note: See TracChangeset for help on using the changeset viewer.