Merge branch 'unittests' into 2.5.x

2014-01-31 15:02:41 -05:00 · 2014-01-31 15:02:41 -05:00 · b7c79df6ec
commit b7c79df6ec
parent 67ea15ba9c e24d25e398
55 changed files with 4438 additions and 309 deletions
--- a/airtime_mvc/application/services/ShowService.php
+++ b/airtime_mvc/application/services/ShowService.php
@ -1418,7 +1418,7 @@ SQL;
     * @param $ccShow
     * @param $showData
     */
-    private function setCcShow($showData)
+    public function setCcShow($showData)
    {
        if (!$this->isUpdate) {
            $ccShow = new CcShow();