diff options
| author | Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-04-17 20:12:58 +0100 |
|---|---|---|
| committer | Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-04-17 20:12:58 +0100 |
| commit | acd866e421e9ca21c941587c67fcca6c4713c03a (patch) | |
| tree | 1b2cd9fb5c9fd2d9aa1294a56ec6a4540fa31e75 /gallery_views | |
| parent | bbb96f97e0301f4083e39a0e5a9117dc92f0c565 (diff) | |
| download | fisheye-acd866e421e9ca21c941587c67fcca6c4713c03a.tar.gz fisheye-acd866e421e9ca21c941587c67fcca6c4713c03a.tar.bz2 fisheye-acd866e421e9ca21c941587c67fcca6c4713c03a.zip | |
Tidy up to remove 'STRICT' warnings
Split static and dynamic use of getDisplayUrl
Create getContentUrl as the instantiated version
parameters need to be identical across all classes
Diffstat (limited to 'gallery_views')
3 files changed, 6 insertions, 6 deletions
diff --git a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl index 59f518d..536589c 100644 --- a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl +++ b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl @@ -25,7 +25,7 @@ <td style="width:{$tdWidth}%; vertical-align:top;"> <!-- Begin Image Cell --> {box class="box `$galItem->mInfo.content_type_guid`"} - <a href="{$galItem->getDisplayUrl()|escape}"> + <a href="{$galItem->getContentUrl()|escape}"> <img class="thumb" src="{$galItem->getThumbnailUri()}" alt="{$galItem->mInfo.title|escape|default:'image'}" /> </a> {if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_titles' )} diff --git a/gallery_views/position_number/fisheye_position_number_inc.tpl b/gallery_views/position_number/fisheye_position_number_inc.tpl index 0396559..2492a1b 100644 --- a/gallery_views/position_number/fisheye_position_number_inc.tpl +++ b/gallery_views/position_number/fisheye_position_number_inc.tpl @@ -25,7 +25,7 @@ <td style="width:{$tdWidth}%; vertical-align:top;"> <!-- Begin Image Cell --> {box class="box `$galItem->mInfo.content_type_guid`"} - <a href="{$galItem->getDisplayUrl()|escape}"> + <a href="{$galItem->getContentUrl()|escape}"> <img class="thumb" src="{$galItem->getThumbnailUri()}" alt="{$galItem->mInfo.title|escape|default:'image'}" /> </a> {if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_titles' )} diff --git a/gallery_views/simple_list/fisheye_simple_list_inc.tpl b/gallery_views/simple_list/fisheye_simple_list_inc.tpl index 54c5695..26aacfd 100644 --- a/gallery_views/simple_list/fisheye_simple_list_inc.tpl +++ b/gallery_views/simple_list/fisheye_simple_list_inc.tpl @@ -40,14 +40,14 @@ </a> {/if} {else} - <a href="{$galItem->getDisplayUrl()|escape}"> + <a href="{$galItem->getContentUrl()|escape}"> <img class="thumb" src="{$galItem->getThumbnailUri()}" alt="{$galItem->getTitle()|escape|default:'image'}" /> </a> {/if} </td> {/if} <td> - <h3><a href="{$galItem->getDisplayUrl()}">{$galItem->getTitle()|escape}</a></h3> + <h3><a href="{$galItem->getContentUrl()}">{$galItem->getTitle()|escape}</a></h3> {if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) && $galItem->mInfo.data} {$galItem->mInfo.parsed_data} {/if} @@ -58,7 +58,7 @@ {if $gBitSystem->isFeatureActive( 'fisheye_item_list_name' )} {if $br}<br />{/if} {if $gBitUser->hasPermission( 'p_treasury_view_item' )} - <a href="{$galItem->getDisplayUrl()}"> + <a href="{$galItem->getContentUrl()}"> {/if} {$galItem->mInfo.filename} <small>({$galItem->mInfo.mime_type})</small> {if $gBitUser->hasPermission( 'p_treasury_view_item' )} @@ -97,7 +97,7 @@ <a href="{$galItem->mInfo.download_url}">{biticon ipackage="icons" iname="emblem-downloads" iexplain="Download File"}</a> {/if} {if $gBitUser->hasPermission( 'p_treasury_view_item' )} - <a href="{$galItem->getDisplayUrl()}">{biticon ipackage="icons" iname="document-open" iexplain="View File"}</a> + <a href="{$galItem->getContentUrl()}">{biticon ipackage="icons" iname="document-open" iexplain="View File"}</a> {/if} {if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()} <a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&action=edit">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit File"}</a> |