Changeset 2476


Ignore:
Timestamp:
Aug 16, 2008, 3:32:37 AM (16 years ago)
Author:
rvelices
Message:
  • optim dont include a php file if not required
  • eng lang small change
  • remove link to unexisting admin css
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/common.inc.php

    r2413 r2476  
    190190if
    191191  (
    192       defined('IN_ADMIN') and IN_ADMIN 
     192      defined('IN_ADMIN') and IN_ADMIN
    193193  )
    194194{
    … …  
    197197  list($user['admin_template'], $user['admin_theme']) =
    198198    explode ('/', $conf['admin_layout']);
    199   $template = new Template(PHPWG_ROOT_PATH.'admin/template/' 
     199  $template = new Template(PHPWG_ROOT_PATH.'admin/template/'
    200200    . $user['admin_template'], $user['admin_theme'] );
    201201}
    … …  
    264264if (!empty($conf['filter_pages']) and get_filter_page_value('used'))
    265265{
    266   include(PHPWG_ROOT_PATH.'include/functions_filter.inc.php');
    267266  include(PHPWG_ROOT_PATH.'include/filter.inc.php');
    268267}

  • trunk/include/filter.inc.php

    r2448 r2476  
    127127    $header_notes[] = l10n_dec('note_filter_day', 'note_filter_days', $filter['recent_period']);
    128128  }
     129  include_once(PHPWG_ROOT_PATH.'include/functions_filter.inc.php');
    129130}
    130131else

  • trunk/include/template.class.php

    r2464 r2476  
    146146  function set_filenames($filename_array)
    147147  {
    148     global $conf; 
     148    global $conf;
    149149    if (!is_array($filename_array))
    150150    {
    … …  
    160160      else
    161161      {
    162         if (!isset($this->files[$handle])) $this->files[$handle] = $filename;
     162        $this->files[$handle] = $filename;
    163163        foreach ($tpl_extension as $file => $conditions)
    164164        {
    165165          $localtpl = './template-extension/' . $file;
    166           if ($handle == $conditions[0] and 
    167              (stripos(implode('/',array_flip($_GET)),$conditions[1])>0 
     166          if ($handle == $conditions[0] and
     167             (stripos(implode('/',array_flip($_GET)),$conditions[1])>0
    168168              or $conditions[1] == 'N/A')
    169169              and file_exists($localtpl))
    170170          { /* examples: Are best_rated, created-monthly-calendar, list, ... set? */
    171               $this->files[$handle] = '../.' . $localtpl; 
     171              $this->files[$handle] = '../.' . $localtpl;
    172172              /* assign their tpl-extension */
    173173          }
    … …  
    177177    return true;
    178178  }
    179   function on_extension($key, $tlpname)
    180   {
    181     return $tplname;
    182   }
     179
    183180  /** see smarty assign http://www.smarty.net/manual/en/api.assign.php */
    184181  function assign($tpl_var, $value = null)
    … …  
    257254      $this->smarty->compile_id .= '.'.$lang_info['code'];
    258255    }
    259    
     256
    260257    $v = $this->smarty->fetch($this->files[$handle], null, null, false);
    261    
     258
    262259    if (isset ($save_compile_id) )
    263260    {
    264261      $this->smarty->compile_id = $save_compile_id;
    265262    }
    266      
     263
    267264    if ($return)
    268265    {
    … …  
    336333    return explode($delimiter, $text);
    337334  }
    338  
     335
    339336  /**
    340337   * This smarty "html_head" block allows to add content just before
    341338   * </head> element in the output after the head has been parsed. This is
    342339   * handy in order to respect strict standards when <style> and <link>
    343    * html elements must appear in the <head> element           
     340   * html elements must appear in the <head> element
    344341   */
    345342  function block_html_head($params, $content, &$smarty, &$repeat)
    … …  
    358355    }
    359356  }
    360  
    361   /**
    362    * Smarty prefilter to allow caching (whenever possible) language strings 
     357
     358  /**
     359   * Smarty prefilter to allow caching (whenever possible) language strings
    363360   * from templates.
    364361   */
    … …  
    368365    $ldq = preg_quote($this->smarty->left_delimiter, '~');
    369366    $rdq = preg_quote($this->smarty->right_delimiter, '~');
    370    
     367
    371368    $regex = "~$ldq *\'([^'$]+)\'\|@translate *$rdq~";
    372369    $source = preg_replace( $regex.'e', 'isset($lang[\'$1\']) ? $lang[\'$1\'] : \'$0\'', $source);

  • trunk/language/en_UK/common.lang.php

    r2342 r2476  
    6161$lang['Confirm Password'] = 'Confirm Password';
    6262$lang['Connection settings'] = 'Connection settings';
    63 $lang['Connection'] = 'Connection';
     63$lang['Connection'] = 'Login';
    6464$lang['Contact webmaster'] = 'Contact webmaster';
    6565$lang['Create a new account'] = 'Create a new account';

  • trunk/template/yoga/default-layout.css

    r2456 r2476  
    11/* $Id$ */
    2 @import "admin/default-layout.css";
    32BODY {
    43  margin: 5px;
Note: See TracChangeset for help on using the changeset viewer.