fix typecho#954

sbwml · May 12, 2020 · 3413dfd · 3413dfd
1 parent 371e6c9
commit 3413dfd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/Typecho-dev-Ci.yml b/.github/workflows/Typecho-dev-Ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.0','7.2', '7.3', '7.4']
+        php: ['7.2', '7.3', '7.4']
     steps:
     - name: Checkout code
       uses: actions/checkout@v2

diff --git a/var/Typecho/Db/Query.php b/var/Typecho/Db/Query.php
@@ -401,7 +401,13 @@ public function expression($key, $value, $escape = true)
      */
     public function order($orderby, $sort = Typecho_Db::SORT_ASC)
     {
-        $this->_sqlPreBuild['order'] = ' ORDER BY ' . $this->filterColumn($orderby) . (empty($sort) ? NULL : ' ' . $sort);
+        if (empty($this->_sqlPreBuild['order'])) {
+            $this->_sqlPreBuild['order'] = ' ORDER BY ';
+        } else {
+            $this->_sqlPreBuild['order'] .= ', ';
+        }
+
+        $this->_sqlPreBuild['order'] .= $this->filterColumn($orderby) . (empty($sort) ? NULL : ' ' . $sort);
         return $this;
     }