From 00c9469fbac2f7927ae728a47e09ce06f4b11205 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 19 Aug 2015 15:11:57 -0400
Subject: [PATCH] FIX: Don't include admin in non-admin and vice versa

---
 lib/discourse_plugin_registry.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 5ca364b1a00..45858362151 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -87,8 +87,10 @@ class DiscoursePluginRegistry
     self.asset_globs.each do |g|
       root, ext, options = *g
 
-      if each_options[:admin]
-        next unless options[:admin]
+      if options[:admin]
+        next unless each_options[:admin]
+      else
+        next if each_options[:admin]
       end
 
       Dir.glob("#{root}/**/*") do |f|