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 fdeebc1..11d00fc 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'] + ' - ' + res.__("layoutAdmin.about_management"), about: about,