Merge branch 'next' into ar2rsawseen/next

Author: ar2rsawseen

plugins/star-rating/api/api.js

@@ -689,7 +689,7 @@ function uploadFile(myfile, id, callback) {
             common.db.collection("feedback_widgets").findAndModify({"_id": widgetId }, {}, {$set: changes}, function(err, widget) {
                 if (!err && widget) {
                     widget = widget.value;
-                    if (cohortsEnabled && (widget.cohortID && !changes.targeting) || JSON.stringify(changes.targeting) !== JSON.stringify(widget.targeting)) {
+                    if (cohortsEnabled && ((widget.cohortID && !changes.targeting) || JSON.stringify(changes.targeting) !== JSON.stringify(widget.targeting))) {
                         if (widget.cohortID) {
                             if (changes.targeting) { //we are not setting to empty one
                                 //changes.targeting.app_id = widget.app_id + "";
@@ -1777,6 +1777,7 @@ function uploadFile(myfile, id, callback) {
             newAtt.cohort_name = "[CLY]_" + type + id;
 
             if (!newAtt.user_segmentation || !newAtt.user_segmentation.query) {
+                newAtt.user_segmentation = newAtt.user_segmentation || {};
                 newAtt.user_segmentation.query = "{}";
                 newAtt.user_segmentation.queryText = "{}";
             }

plugins/star-rating/frontend/public/javascripts/countly.models.js

@@ -146,7 +146,7 @@
      */
     starRatingPlugin.requestFeedbackData = function(filterObj) {
         var data = {app_id: countlyCommon.ACTIVE_APP_ID};
-        if (filterObj.period) {
+        if (filterObj && filterObj.period) {
             if (filterObj.period !== 'noperiod') {
                 data.period = filterObj.period;
             }