From 565fa1f60e3adcf263f96a1a3f76f6a366ccf2a6 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 16 May 2018 14:26:03 +0800
Subject: [PATCH] Fix regression introduced in
 https://github.com/tgxworld/discourse/commit/8cf0f51eb2c9ef5c6155d77aab1d0d9c7b104af0.

---
 app/serializers/admin_plugin_serializer.rb       |  4 ++--
 spec/serializers/admin_plugin_serializer_spec.rb | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 spec/serializers/admin_plugin_serializer_spec.rb

diff --git a/app/serializers/admin_plugin_serializer.rb b/app/serializers/admin_plugin_serializer.rb
index 2ac11f3413..b115071496 100644
--- a/app/serializers/admin_plugin_serializer.rb
+++ b/app/serializers/admin_plugin_serializer.rb
@@ -30,11 +30,11 @@ class AdminPluginSerializer < ApplicationSerializer
   end
 
   def include_enabled_setting?
-    object.enabled_site_setting
+    enabled_setting.present?
   end
 
   def enabled_setting
-    true
+    object.enabled_site_setting
   end
 
   def include_enabled_setting_filter?
diff --git a/spec/serializers/admin_plugin_serializer_spec.rb b/spec/serializers/admin_plugin_serializer_spec.rb
new file mode 100644
index 0000000000..70d8430a05
--- /dev/null
+++ b/spec/serializers/admin_plugin_serializer_spec.rb
@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe AdminPluginSerializer do
+  let(:instance) { Plugin::Instance.new }
+
+  subject { described_class.new(instance) }
+
+  describe 'enabled_setting' do
+    it 'should return the right value' do
+      instance.enabled_site_setting('test')
+      expect(subject.enabled_setting).to eq('test')
+    end
+  end
+end