From 370d6e1fbae282f6f5bd5c210459e8b7de11f238 Mon Sep 17 00:00:00 2001 From: Yuchen Wang Date: Thu, 24 Nov 2011 17:08:52 -0500 Subject: [PATCH 1/2] CC-3104: Timezone issues in the widget Added is_numeric check --- airtime_mvc/application/controllers/ApiController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index d70476e06..8e97e639c 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -175,7 +175,7 @@ class ApiController extends Zend_Controller_Action /** * Retrieve the currently playing show as well as upcoming shows. * Number of shows returned and the time interval in which to - * get the next shows can be configured as post parameters. + * get the next shows can be configured as GET parameters. * * TODO: in the future, make interval length a parameter instead of hardcode to 48 * @@ -206,7 +206,7 @@ class ApiController extends Zend_Controller_Action } $limit = $request->getParam('limit'); - if($limit == "") { + if($limit == "" || !is_numeric($limit)) { $limit = "5"; } From 5222fe71a5ee0e1fd33c7c11dca0d7d2b09dc912 Mon Sep 17 00:00:00 2001 From: Yuchen Wang Date: Thu, 24 Nov 2011 17:10:56 -0500 Subject: [PATCH 2/2] CC-3089: Link to manual in Help menu should point to manuals.sourcefabric.org rather than flossmanuals.net Updated per Paul's comment --- airtime_mvc/application/configs/navigation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index 74c360b08..851cae36b 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -96,7 +96,7 @@ $pages = array( ), array( 'label' => 'User Manual', - 'uri' => "http://manuals.sourcefabric.org/", + 'uri' => "http://www.sourcefabric.org/en/airtime/manuals/", 'target' => "_blank" ), array(