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

2012-09-13 17:11:10 -04:00 · 2012-09-13 17:11:10 -04:00 · c35c76351b
commit c35c76351b
parent 8f48544bb7 d93fcec490
4 changed files with 29 additions and 7 deletions
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@ -1297,6 +1297,9 @@ SQL;
                    $i++;
                }
            }
+            
+            // check if file exists
+            $qry->add("file_exists", "true", Criteria::EQUAL);
            $qry->addAscendingOrderByColumn('random()');
        }
        // construct limit restriction