Changeset 25464


Ignore:
Timestamp:
Nov 12, 2013, 9:30:35 PM (10 years ago)
Author:
rvelices
Message:

bug 2963: Ability to create css/js smarty templates - fixes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/template.class.php

    r25462 r25464  
    13731373      {
    13741374        $this->flush_pending($result, $pending, $key, $force);
    1375         $pending = array();
    13761375        $key = $this->is_css ? array(get_absolute_root_url(false)): array(); //because for css we modify bg url
    1377         $result[] = $combinable;
     1376        $pending = array($combinable);
    13781377      }
    13791378    }
    … …  
    14141413  private function process_combinable($combinable, $return_content, $force)
    14151414  {
     1415    global $conf;
    14161416    if ($combinable->is_template)
    14171417    {
    … …  
    14211421        if ($conf['template_compile_check'])
    14221422          $key[] = filemtime( PHPWG_ROOT_PATH . $combinable->path );
    1423         $file = PWG_COMBINED_DIR . 't' . base_convert(crc32($key),10,36) . '.' . $this->type;
     1423        $file = PWG_COMBINED_DIR . 't' . base_convert(crc32(implode(',',$key)),10,36) . '.' . $this->type;
    14241424        if (!$force && file_exists(PHPWG_ROOT_PATH.$file) )
    14251425        {
Note: See TracChangeset for help on using the changeset viewer.