Merge branch 'master' of https://github.com/easysoft/zentaopms

module/bug/control.php

@@ -414,7 +414,6 @@ class bug extends control
                 $title = $file['title'];
                 $titles[$title] = $fileName;
             }
-            krsort($titles);
             $this->view->titles = $titles;
         }
 

module/bug/model.php

@@ -182,9 +182,8 @@ class bugModel extends model
                         $file['addedDate']  = $now;
                         $this->dao->insert(TABLE_FILE)->data($file)->exec();
 
-                        $fileID = $this->dao->lastInsertID;
+                        $fileID = $this->dao->lastInsertID();
                         $bug->steps .= '<img src="{' . $fileID . '.' . $file['extension'] . '}" alt="" />';
-                        unset($file);
                     }
                 }
                 else

module/story/model.php

@@ -326,8 +326,11 @@ class storyModel extends model
                     {
                         $file['addedBy']    = $this->app->user->account;    
                         $file['addedDate']  = $now;     
+                        $file['objectType'] = 'story';
+                        $file['objectID']   = $storyID;
                         if(in_array($file['extension'], $this->config->file->imageExtensions))
                         {
+                            $file['extra'] = 'editor';
                             $this->dao->insert(TABLE_FILE)->data($file)->exec();
 
                             $fileID = $this->dao->lastInsertID();
@@ -335,8 +338,6 @@ class storyModel extends model
                         }
                         else
                         {
-                            $file['objectType'] = 'story';
-                            $file['objectID']   = $storyID;
                             $this->dao->insert(TABLE_FILE)->data($file)->exec();
                         }
                     }