Merge branch 'master' into gh-pages

1 files changed, 6 insertions, 3 deletions

diff --git a/jquery.weekcalendar.js b/jquery.weekcalendar.js
index 81347b3..dddfe36 100644
--- a/jquery.weekcalendar.js
+++ b/jquery.weekcalendar.js
@@ -2126,10 +2126,13 @@
       _getEventUserId: function(calEvent){
          var self = this;
          var options = this.options;
-          if($.isFunction(options.getEventUserId)){
+				 if( options.showAsSeparateUsers && options.users && options.users.length ){
+					 if($.isFunction(options.getEventUserId)){
             return options.getEventUserId(calEvent, self.element);
-          }
-        return calEvent.userId;
+					 }
+					 return calEvent.userId;
+				 }
+				 return [];
       },
       /**
        * sets the event user id on given calEvent