Warning in the TV channels (issue #6231)

dmitry-vinogradov · Nov 18, 2015 · 6ff0048 · 6ff0048
1 parent 99def00
commit 6ff0048
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/admin/src/Controller/TvChannelsController.php b/admin/src/Controller/TvChannelsController.php
@@ -98,7 +98,7 @@ public function move_channel() {
             $filter = $this->getIPTVfilters();
         }
 
-        $allChannels = $this->db->getAllChannels(array('where' => $filter));
+        $allChannels = $this->db->getAllChannels(array('select' => $this->getAllChannelsFields(), 'where' => $filter, 'order'=> array('number' => 'ASC')));
 
         if (is_array($allChannels)) {
             while (list($num, $row) = each($allChannels)) {
@@ -110,7 +110,6 @@ public function move_channel() {
                 unset($allChannels[0]);
             }
         }
-
         $this->app['allChannels'] = $this->fillEmptyRows($allChannels);
 
         return $this->app['twig']->render($this->getTemplateName(__METHOD__));
@@ -1775,6 +1774,7 @@ private function getAllGenres(){
     private function getAllChannelsFields(){
         return array(
             'id' => 'itv.id as `id`',
+            'locked' => 'itv.locked as `locked`',
             'number' => 'itv.number as `number`',
             'logo' => 'itv.logo as `logo`',
             'name' => 'itv.name as `name`',