* merge from 15.0.beta3.

2021-06-05 13:01:53 +08:00
parent 7ff5ccae12
commit 769e6b433b
220 changed files with 2661 additions and 1370 deletions
@@ -78,7 +78,9 @@ class programModel extends model
     */
    public function getByID($programID = 0)
    {
-        return $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->andWhere('`type`')->eq('program')->fetch();
+        $program = $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->andWhere('`type`')->eq('program')->fetch();
+        $program = $this->loadModel('file')->replaceImgURL($program, 'desc');
+        return $program;
    }

    /**