Changeset 17180


Ignore:
Timestamp:
07/27/12 18:11:36 (7 years ago)
Author:
mistic100
Message:

if get_photo_sized() is called on picture page, there is a conflict betweens variables

Location:
extensions/ExtendedDescription
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/ExtendedDescription/main.inc.php

    r17010 r17180  
    442442 
    443443    $template->assign(array( 
    444       'current' => array( 
     444      'ed_image' => array( 
    445445        'selected_derivative' => $selected_derivative, 
    446         ), 
    447       'ALT_IMG' => $picture['file'], 
    448       )); 
     446        'ALT_IMG' => $picture['file'], 
     447      ))); 
    449448 
    450449    // output 
  • extensions/ExtendedDescription/template/picture_content.tpl

    r16962 r17180  
    1 {if !$current.selected_derivative->is_cached()} 
     1{if !$ed_image.selected_derivative->is_cached()} 
    22{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} 
    33{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} 
    44{/if} 
    55 
    6 <img {if $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()} {else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax-loader-big.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}"> 
     6<img {if $ed_image.selected_derivative->is_cached()}src="{$ed_image.selected_derivative->get_url()}" {$ed_image.selected_derivative->get_size_htm()} {else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax-loader-big.gif" data-src="{$ed_image.selected_derivative->get_url()}"{/if} alt="{$ed_image.ALT_IMG}"> 
Note: See TracChangeset for help on using the changeset viewer.