From 8b9793a9288495ab4e2f8f588b202299e6afc15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E9=B9=8F=E9=A3=9E?= <ypf93@qq.com>
Date: Mon, 23 May 2016 17:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=A1=B5=E9=9D=A2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore      | 3 +++
 routes/admin.js | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 552f221..2b0fc04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 node_modules/
 *.log
+public/libs
+.idea/
+.gitignore
\ No newline at end of file
diff --git a/routes/admin.js b/routes/admin.js
index e4e7980..795b9b4 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -351,7 +351,7 @@ router.get('/aboutmanage', function (req, res, next) {
                 if (err) {
                     cb(err);
                 } else {
-                    cb(null, about);
+                    cb(null, settings);
                 }
             });
         }
@@ -361,8 +361,8 @@ router.get('/aboutmanage', function (req, res, next) {
         if (err) {
             next(err);
         } else {
-            settings = results[0];
-            about = results[1];
+            about = results[0];
+            settings = results[1];
             res.render('admin/aboutmanage', {
                 title: settings['SiteName'] + ' - 关于管理',
                 about: about,