From 37689843a308207f54882b2fb700e3713d7e67d6 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 2 Nov 2009 09:43:12 -0800 Subject: [PATCH] Update the POD for the AssetProxy macro, re the displaying of edit controls. Fixes bug #11189 --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Macro/AssetProxy.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index f8f5a8a04..da11ebf1e 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -33,6 +33,7 @@ - added: getTopKeywords method to Keywords API - added: print remaining tickets feature to EMS - fixed #11188: Incoherence in Navigation edit form + - fixed #11189: Controls variable missing in image asset in AssetProxy 7.8.2 - Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi) diff --git a/lib/WebGUI/Macro/AssetProxy.pm b/lib/WebGUI/Macro/AssetProxy.pm index 268cd3cc8..0e7ef77ce 100644 --- a/lib/WebGUI/Macro/AssetProxy.pm +++ b/lib/WebGUI/Macro/AssetProxy.pm @@ -27,9 +27,9 @@ Macro for displaying the output of an Asset in another location. =head3 url | assetId -My specify either the asset url or the asset id. If no Asset with that URL or id can be found, an internationalized error message will be returned instead. +Specify either the asset url or the asset id. If no Asset with that URL or id can be found, an internationalized error message will be returned instead. -No editing controls (toolbar) will be displayed in the Asset output, even if Admin is turned on. +Editing controls (toolbar) may or may not be displayed in the Asset output, even if Admin is turned on. The Not Found Page may not be Asset Proxied.