closes #6340

install/package.json

@@ -2,19 +2,19 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.7.3",
+    "version": "1.7.5",
     "homepage": "http://www.nodebb.org",
     "repository": {
-      "type": "git",
-      "url": "https://github.com/NodeBB/NodeBB/"
+        "type": "git",
+        "url": "https://github.com/NodeBB/NodeBB/"
     },
     "main": "app.js",
     "scripts": {
-      "start": "node loader.js",
-      "lint": "eslint --cache ./nodebb .",
-      "pretest": "npm run lint",
-      "test": "nyc --reporter=html --reporter=text-summary mocha",
-      "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
+        "start": "node loader.js",
+        "lint": "eslint --cache ./nodebb .",
+        "pretest": "npm run lint",
+        "test": "nyc --reporter=html --reporter=text-summary mocha",
+        "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
     },
     "dependencies": {
         "ace-builds": "^1.2.9",
@@ -61,7 +61,7 @@
         "nconf": "^0.9.1",
         "nodebb-plugin-composer-default": "6.0.8",
         "nodebb-plugin-dbsearch": "2.0.9",
-        "nodebb-plugin-emoji": "2.0.9",
+        "nodebb-plugin-emoji": "^2.1.0",
         "nodebb-plugin-emoji-android": "2.0.0",
         "nodebb-plugin-markdown": "8.2.2",
         "nodebb-plugin-mentions": "2.2.2",
@@ -69,9 +69,6 @@
         "nodebb-plugin-spam-be-gone": "0.5.1",
         "nodebb-rewards-essentials": "0.0.11",
         "nodebb-theme-lavender": "5.0.1",
-        "nodebb-theme-persona": "7.2.18",
-        "nodebb-theme-slick": "1.1.4",
-        "nodebb-theme-vanilla": "8.1.8",
         "nodebb-theme-persona": "7.2.16",
         "nodebb-theme-slick": "1.1.4",
         "nodebb-theme-vanilla": "8.1.7",
@@ -105,39 +102,39 @@
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
-      "coveralls": "^3.0.0",
-      "eslint": "^4.14.0",
-      "eslint-config-airbnb-base": "^12.1.0",
-      "eslint-plugin-import": "^2.8.0",
-      "grunt": "^1.0.1",
-      "grunt-contrib-watch": "^1.0.0",
-      "jsdom": "^11.5.1",
-      "mocha": "^4.1.0",
-      "mocha-lcov-reporter": "^1.3.0",
-      "nyc": "^11.4.1",
-      "smtp-server": "^3.4.1"
+        "coveralls": "^3.0.0",
+        "eslint": "^4.14.0",
+        "eslint-config-airbnb-base": "^12.1.0",
+        "eslint-plugin-import": "^2.8.0",
+        "grunt": "^1.0.1",
+        "grunt-contrib-watch": "^1.0.0",
+        "jsdom": "^11.5.1",
+        "mocha": "^4.1.0",
+        "mocha-lcov-reporter": "^1.3.0",
+        "nyc": "^11.4.1",
+        "smtp-server": "^3.4.1"
     },
     "bugs": {
-      "url": "https://github.com/NodeBB/NodeBB/issues"
+        "url": "https://github.com/NodeBB/NodeBB/issues"
     },
     "engines": {
-      "node": ">=6"
+        "node": ">=6"
     },
     "maintainers": [
-      {
-        "name": "Andrew Rodrigues",
-        "email": "andrew@nodebb.org",
-        "url": "https://github.com/psychobunny"
-      },
-      {
-        "name": "Julian Lam",
-        "email": "julian@nodebb.org",
-        "url": "https://github.com/julianlam"
-      },
-      {
-        "name": "Barış Soner Uşaklı",
-        "email": "baris@nodebb.org",
-        "url": "https://github.com/barisusakli"
-      }
+        {
+            "name": "Andrew Rodrigues",
+            "email": "andrew@nodebb.org",
+            "url": "https://github.com/psychobunny"
+        },
+        {
+            "name": "Julian Lam",
+            "email": "julian@nodebb.org",
+            "url": "https://github.com/julianlam"
+        },
+        {
+            "name": "Barış Soner Uşaklı",
+            "email": "baris@nodebb.org",
+            "url": "https://github.com/barisusakli"
+        }
     ]
-  }
+}

public/src/client/account/settings.js

@@ -55,7 +55,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds'
 			if (skinName === 'default') {
 				skinName = config.defaultBootswatchSkin;
 			}
-			var cssSource = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + skinName + '/bootstrap.min.css';
+			var cssSource = '//maxcdn.bootstrapcdn.com/bootswatch/3.3.7/' + skinName + '/bootstrap.min.css';
 			if (css.length) {
 				css.attr('href', cssSource);
 			} else {

src/controllers/composer.js

@@ -10,13 +10,13 @@ var helpers = require('./helpers');
 
 exports.get = function (req, res, callback) {
 	async.waterfall([
-		function (next) {
+		function (_next) {
 			plugins.fireHook('filter:composer.build', {
 				req: req,
 				res: res,
 				next: callback,
 				templateData: {},
-			}, next);
+			}, _next);
 		},
 		function (data) {
 			if (data.templateData.disabled) {

src/database/mongo/main.js

@@ -66,7 +66,21 @@ module.exports = function (db, module) {
 		if (!key) {
 			return callback();
 		}
-		module.getObjectField(key, 'data', callback);
+		module.getObject(key, function (err, objectData) {
+			if (err) {
+				return callback(err);
+			}
+			// fallback to old field name 'value' for backwards compatibility #6340
+			var value = null;
+			if (objectData) {
+				if (objectData.hasOwnProperty('data')) {
+					value = objectData.data;
+				} else if (objectData.hasOwnProperty('value')) {
+					value = objectData.value;
+				}
+			}
+			callback(null, value);
+		});
 	};
 
 	module.set = function (key, value, callback) {

src/middleware/header.js

@@ -283,7 +283,7 @@ module.exports = function (middleware) {
 			}
 
 			if (skinToUse) {
-				obj.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + skinToUse + '/bootstrap.min.css';
+				obj.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/3.3.7/' + skinToUse + '/bootstrap.min.css';
 			}
 		}
 	}

test/database/keys.js

@@ -27,6 +27,14 @@ describe('Key methods', function () {
 		});
 	});
 
+	it('should return null if key does not exist', function (done) {
+		db.get('doesnotexist', function (err, value) {
+			assert.ifError(err);
+			assert.equal(value, null);
+			done();
+		});
+	});
+
 	it('should return true if key exist', function (done) {
 		db.exists('testKey', function (err, exists) {
 			assert.ifError(err);