Skip to content

Commit

Permalink
Merge branch 'hotfix/v1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredwsmith committed Dec 3, 2015
2 parents d1a2324 + defb0ca commit 89c2ca3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion inc/output/WxTweet.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ function render_tweet($tweet_template = null) {
* @return string Human-readable timestamp for tweets
*/
protected function format_time($timestamp) {
if($this->is_future($timestamp) && !$this->is_tomorrow($timestamp)) {
if($timestamp - $this->curr_timestamp >= 86400 && !$this->is_tomorrow($timestamp)) {
$date_format = 'M j \a\t g:i A';
}
else {
Expand Down

0 comments on commit 89c2ca3

Please sign in to comment.