Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2011-11-24 18:10:59 -05:00
parent 15a27526f9 5222fe71a5
commit e9c25faa34
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/configs/navigation.php
View File

@ -96,7 +96,7 @@ $pages = array(
), ),
array( array(
'label' => 'User Manual', 'label' => 'User Manual',
'uri' => "http://manuals.sourcefabric.org/", 'uri' => "http://www.sourcefabric.org/en/airtime/manuals/",
'target' => "_blank" 'target' => "_blank"
), ),
array( array(

4
airtime_mvc/application/controllers/ApiController.php
View File

@ -175,7 +175,7 @@ class ApiController extends Zend_Controller_Action
/** /**
* Retrieve the currently playing show as well as upcoming shows. * Retrieve the currently playing show as well as upcoming shows.
* Number of shows returned and the time interval in which to * 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 * 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'); $limit = $request->getParam('limit');
if($limit == "") { if($limit == "" || !is_numeric($limit)) {
$limit = "5"; $limit = "5";
} }