From ceaa3a334df7c4df047046e4ec9603f48a62d152 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 3 Nov 2015 20:15:22 -0500
Subject: [PATCH] Squashed commit of the following:

commit 3a39e5e6bd3c357d78d8ec1dad6e3a64c18ee3ab
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:15:10 2015 -0500

    minor tweak

commit ed3c25ba8b431a2b730aae78a43cfa934521a5d4
Merge: d9cde96 d7a0adc
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:12:32 2015 -0500

    Merge branch 'master' of https://github.com/acardinale/NodeBB into acardinale-master

commit d7a0adc5c883c5fa3207f3adcd0661246221e7c9
Author: Andrea Cardinale <a.cardinale@webandtech.it>
Date:   Wed Sep 30 10:32:25 2015 +0200

    Get registry (if it's set) from config.json in suggest method (client-side)
---
 public/src/admin/extend/plugins.js | 2 +-
 src/meta/configs.js                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js
index c886a56c75..f3bbe030d5 100644
--- a/public/src/admin/extend/plugins.js
+++ b/public/src/admin/extend/plugins.js
@@ -213,7 +213,7 @@ define('admin/extend/plugins', function() {
 
 	Plugins.suggest = function(pluginId, callback) {
 		var nbbVersion = app.config.version.match(/^\d\.\d\.\d/);
-		$.ajax('https://packages.nodebb.org/api/v1/suggest', {
+		$.ajax((app.config.registry || 'https://packages.nodebb.org') + '/api/v1/suggest', {
 			type: 'GET',
 			data: {
 				package: pluginId,
diff --git a/src/meta/configs.js b/src/meta/configs.js
index b7b6a13b33..3ff42f66ae 100644
--- a/src/meta/configs.js
+++ b/src/meta/configs.js
@@ -32,6 +32,7 @@ module.exports = function(Meta) {
 		db.getObject('config', function (err, config) {
 			config = config || {};
 			config.version = nconf.get('version');
+			config.registry = nconf.get('registry');
 			callback(err, config);
 		});
 	};