Merge branch 'saas' into saas-dev

This commit is contained in:
drigato 2015-07-09 14:11:27 -04:00
commit 9ec75f7179
1 changed files with 2 additions and 3 deletions

View File

@ -69,6 +69,8 @@ class WidgetHelper
* We don't do any timezone conversion in this function on purpose. All timezone conversion * We don't do any timezone conversion in this function on purpose. All timezone conversion
* and show time ordering should be done on the frontend. * and show time ordering should be done on the frontend.
* *
* *** This function does no HTML encoding. It is up to the caller to escape or encode the data appropriately.
*
* @return array * @return array
*/ */
public static function getWeekInfoV2() public static function getWeekInfoV2()
@ -139,9 +141,6 @@ class WidgetHelper
} }
$result["shows"] = $shows; $result["shows"] = $shows;
// XSS exploit prevention
SecurityHelper::htmlescape_recursive($result);
// convert image paths to point to api endpoints // convert image paths to point to api endpoints
//TODO: do we need this here? //TODO: do we need this here?
self::findAndConvertPaths($result); self::findAndConvertPaths($result);