Skip to content

Commit 806f7f7

Browse files
authored
Merge pull request #285 from topcoder-platform/issues-229
Issues-229(Fixed clearing cache), Issues-168, Issues-169
2 parents eb0726a + 9187eb2 commit 806f7f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+258
-32
lines changed

vanilla/applications/vanilla/models/class.categorymodel.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,8 @@ public function follow($userID, $categoryID, $followed = null) {
367367
['Followed' => $followed],
368368
['UserID' => $userID, 'CategoryID' => $categoryID]
369369
);
370-
static::clearUserCache();
370+
371+
static::clearUserCache($userID);
371372
Gdn::cache()->remove("Follow_{$userID}");
372373

373374
$result = $this->isFollowed($userID, $categoryID);

vanilla/applications/vanilla/views/discussions/helper_functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,11 @@ function newComments($discussion) {
334334
if ($discussion->CountUnreadComments === TRUE) {
335335
$title = htmlspecialchars(t("You haven't read this yet."));
336336

337-
return ' <strong class="HasNew JustNew NewCommentCount" title="'.$title.'">'.t('new discussion', 'new').'</strong>';
337+
return ' <span class="MItem"><strong class="HasNew JustNew NewCommentCount" title="'.$title.'">'.t('new discussion', 'new').'</strong></span>';
338338
} elseif ($discussion->CountUnreadComments > 0) {
339339
$title = htmlspecialchars(plural($discussion->CountUnreadComments, "%s new comment since you last read this.", "%s new comments since you last read this."));
340340

341-
return ' <strong class="HasNew NewCommentCount" title="'.$title.'">'.plural($discussion->CountUnreadComments, '%s new', '%s new plural', bigPlural($discussion->CountUnreadComments, '%s new', '%s new plural')).'</strong>';
341+
return ' <span class="MItem"><strong class="HasNew NewCommentCount" title="'.$title.'">'.plural($discussion->CountUnreadComments, '%s new', '%s new plural', bigPlural($discussion->CountUnreadComments, '%s new', '%s new plural')).'</strong><span>';
342342
}
343343
return '';
344344
}

vanilla/dist/admin/addons/dashboard.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vanilla/dist/admin/addons/rich-editor.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vanilla/dist/admin/addons/swagger-ui.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vanilla/dist/admin/addons/vanilla.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vanilla/dist/admin/async~highlightJs.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vanilla/dist/admin/async~mountEditor.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vanilla/dist/admin/bootstrap.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vanilla/dist/admin/highlightJs-dark.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)