Changeset 8008


Ignore:
Timestamp:
Dec 6, 2010, 4:39:51 PM (10 years ago)
Author:
patdenice
Message:

Missing quote in header.tpl.
Add $id to script class (needed in cmp_by_mode_and_order function).

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/themes/default/template/header.tpl

    r7995 r8008  
    2626<!-- END get_combined_scripts -->
    2727
    28 {combine_script id='jquery' path='themes/default/js/jquery.packed.js}
     28{combine_script id='jquery' path='themes/default/js/jquery.packed.js'}
    2929
    3030<!--[if lt IE 7]>
  • trunk/include/template.class.php

    r7995 r8008  
    823823final class Script
    824824{
     825  public $id;
    825826  public $load_mode;
    826827  public $precedents = array();
     
    829830  public $extra = array();
    830831
    831   function Script($load_mode, $precedents, $path, $version)
    832   {
     832  function Script($id, $load_mode, $precedents, $path, $version)
     833  {
     834    $this->id = $id;
    833835    $this->load_mode = $load_mode;
    834836    $this->precedents = $precedents;
     
    900902    if (! isset( $this->registered_scripts[$id] ) )
    901903    {
    902       $script = new Script($load_mode, $require, $path, $version);
     904      $script = new Script($id, $load_mode, $require, $path, $version);
    903905      self::fill_well_known($id, $script);
    904906      $this->registered_scripts[$id] = $script;
Note: See TracChangeset for help on using the changeset viewer.