Merge branch 'sprint/app10' into sprint/170

2021-11-19 08:41:00 +08:00
parent 68d5d5e903 adc2aa1c9b
commit fde5cb61da
63 changed files with 2603 additions and 338 deletions
@@ -834,7 +834,7 @@ class fileModel extends model
        $data = new stdclass();
        $data->objectID   = $objectID;
        $data->objectType = $objectType;
-        $data->extra      = 'editor';
+        if(!defined('RUN_MODE') OR RUN_MODE != 'api') $data->extra = 'editor';
        if(isset($_SESSION['album']['used'][$uid]) and $_SESSION['album']['used'][$uid])
        {
            $this->dao->update(TABLE_FILE)->data($data)->where('id')->in($_SESSION['album']['used'][$uid])->exec();