Changeset 744243
- Timestamp:
- 07/22/2013 07:15:32 AM (13 years ago)
- Location:
- gplus-comments
- Files:
-
- 7 edited
- 13 copied
-
tags/1.5.5 (copied) (copied from gplus-comments/trunk)
-
tags/1.5.5/assets/styles/plugin.css (copied) (copied from gplus-comments/trunk/assets/styles/plugin.css) (1 diff)
-
tags/1.5.5/comments-evolved.php (copied) (copied from gplus-comments/trunk/comments-evolved.php) (1 diff)
-
tags/1.5.5/includes/lib/frontend.php (copied) (copied from gplus-comments/trunk/includes/lib/frontend.php) (2 diffs)
-
tags/1.5.5/includes/lib/plugin.php (modified) (1 diff)
-
tags/1.5.5/includes/templates/container.php (copied) (copied from gplus-comments/trunk/includes/templates/container.php) (2 diffs)
-
tags/1.5.5/includes/templates/partials/disqus.php (copied) (copied from gplus-comments/trunk/includes/templates/partials/disqus.php)
-
tags/1.5.5/includes/templates/partials/facebook.php (copied) (copied from gplus-comments/trunk/includes/templates/partials/facebook.php)
-
tags/1.5.5/includes/templates/partials/gplus.php (copied) (copied from gplus-comments/trunk/includes/templates/partials/gplus.php)
-
tags/1.5.5/includes/templates/partials/livefyre.php (copied) (copied from gplus-comments/trunk/includes/templates/partials/livefyre.php)
-
tags/1.5.5/includes/templates/partials/trackback.php (copied) (copied from gplus-comments/trunk/includes/templates/partials/trackback.php)
-
tags/1.5.5/includes/templates/partials/tweetback.php (copied) (copied from gplus-comments/trunk/includes/templates/partials/tweetback.php)
-
tags/1.5.5/includes/templates/partials/wordpress.php (copied) (copied from gplus-comments/trunk/includes/templates/partials/wordpress.php)
-
tags/1.5.5/readme.txt (copied) (copied from gplus-comments/trunk/readme.txt) (2 diffs)
-
trunk/assets/styles/plugin.css (modified) (1 diff)
-
trunk/comments-evolved.php (modified) (1 diff)
-
trunk/includes/lib/frontend.php (modified) (2 diffs)
-
trunk/includes/lib/plugin.php (modified) (1 diff)
-
trunk/includes/templates/container.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
gplus-comments/tags/1.5.5/assets/styles/plugin.css
r744196 r744243 165 165 .embed-container { 166 166 position: relative; 167 /* overflow: hidden; */168 167 } 169 168 170 169 .embed-container iframe { 171 170 width: 100%; 172 height: 100%;173 171 } -
gplus-comments/tags/1.5.5/comments-evolved.php
r744196 r744243 9 9 License URI: http://www.gnu.org/licenses/gpl-3.0.html 10 10 Donate link: http://www.wepay.com/donations/brandonholtsclaw 11 Version: 1.5. 411 Version: 1.5.5 12 12 */ 13 13 -
gplus-comments/tags/1.5.5/includes/lib/frontend.php
r744012 r744243 18 18 function comments_evolved_get_total_count() { 19 19 $total_count = 0; 20 $wpc = comments_evolved_get_wordpress_count();21 $fbc = comments_evolved_get_facebook_count();22 $gpc = comments_evolved_get_gplus_count();23 20 24 $total_count = $total_count + $fbc + $gpc + $wpc; 21 $wordpress_count = comments_evolved_get_wordpress_count(); 22 //$wordpress_count = get_comments_number(); 23 24 $gplus_count = comments_evolved_get_gplus_count(); 25 $trackback_count = comments_evolved_get_trackback_count(); 26 $facebook_count = comments_evolved_get_facebook_count(); 27 $disqus_count = comments_evolved_get_disqus_count(); 28 29 $total_count = $total_count + $wordpress_count + $gplus_count + $trackback_count + $facebook_count + $disqus_count; 25 30 return $total_count; 26 31 } 27 add_filter('get_comments_number', 'comments_evolved_get_total_count' );32 add_filter('get_comments_number', 'comments_evolved_get_total_count', 4269); 28 33 29 34 function comments_evolved_get_wordpress_count() { 30 global $post, $comments, $wp_query, $comments_by_type; 31 return count($wp_query->comments_by_type['comment']); 35 global $post, $comments, $wp_query, $comments_by_type, $id; 36 $get_comments= get_comments('post_id=' . $id); 37 $comments_by_type = &separate_comments($get_comments); 38 return count($comments_by_type['comment']); 32 39 } 33 40 … … 43 50 $json = json_decode($link_body); 44 51 return $json->$url->comments; 52 } 53 54 function comments_evolved_get_disqus_count($url = "") { 55 if(empty($url)){ $url = get_permalink(); } 56 $options = get_option("comments-evolved"); 57 if(!empty($options["disqus_shortname"])){ 58 $link = 'http://disqus.com/api/3.0/threads/details.json?api_key=qaoZg7DHagkn8xUf9ZqYRacHZI3CuBmGpu5InMmtXgtRzCnq6iGwtn7Fbwq1uysH&forum=' . $options["disqus_shortname"] . '&thread:link=' . urlencode($url); 59 $link_body = wp_remote_retrieve_body(wp_remote_get($link)); 60 $json = json_decode($link_body); 61 if(!empty($json)){ 62 return $json->response->posts; 63 } 64 } 65 return 0; 45 66 } 46 67 -
gplus-comments/tags/1.5.5/includes/lib/plugin.php
r743641 r744243 42 42 43 43 function comments_evolved_shortcode($atts) { 44 extract( shortcode_atts( array( 'width' => '600', ), $atts ) ); 45 44 //extract( shortcode_atts( array( 'width' => '600', ), $atts ) ); 46 45 ob_start(); 47 46 include(COMMENTS_EVOLVED_TEMPLATES . '/container.php'); -
gplus-comments/tags/1.5.5/includes/templates/container.php
r744120 r744243 30 30 </script> 31 31 <div id="comment-tabs"> 32 <a name="comments"></a> 32 33 <?php 33 34 if(!empty($options['comment_area_label'])) { … … 48 49 $trackback_count = comments_evolved_get_trackback_count(); 49 50 $facebook_count = comments_evolved_get_facebook_count(); 51 $disqus_count = comments_evolved_get_disqus_count(); 50 52 51 53 foreach ($tab_order as &$tab) { -
gplus-comments/tags/1.5.5/readme.txt
r744196 r744243 7 7 Requires at least: 3.5 8 8 Tested up to: 3.6 9 Stable Tag: 1.5. 49 Stable Tag: 1.5.5 10 10 11 11 Comments Evolved ( formerly Google+ Comments for WordPress ) makes the comment section tabbed seamlessly adding tabs for Comments & More … … 103 103 104 104 == Change Log == 105 = 1.5.5 = 106 * udates to the disqus comment count 107 * fixes for the comment count total 108 105 109 = 1.5.4 = 106 110 * even more css fixes -
gplus-comments/trunk/assets/styles/plugin.css
r744196 r744243 165 165 .embed-container { 166 166 position: relative; 167 /* overflow: hidden; */168 167 } 169 168 170 169 .embed-container iframe { 171 170 width: 100%; 172 height: 100%;173 171 } -
gplus-comments/trunk/comments-evolved.php
r744196 r744243 9 9 License URI: http://www.gnu.org/licenses/gpl-3.0.html 10 10 Donate link: http://www.wepay.com/donations/brandonholtsclaw 11 Version: 1.5. 411 Version: 1.5.5 12 12 */ 13 13 -
gplus-comments/trunk/includes/lib/frontend.php
r744012 r744243 18 18 function comments_evolved_get_total_count() { 19 19 $total_count = 0; 20 $wpc = comments_evolved_get_wordpress_count();21 $fbc = comments_evolved_get_facebook_count();22 $gpc = comments_evolved_get_gplus_count();23 20 24 $total_count = $total_count + $fbc + $gpc + $wpc; 21 $wordpress_count = comments_evolved_get_wordpress_count(); 22 //$wordpress_count = get_comments_number(); 23 24 $gplus_count = comments_evolved_get_gplus_count(); 25 $trackback_count = comments_evolved_get_trackback_count(); 26 $facebook_count = comments_evolved_get_facebook_count(); 27 $disqus_count = comments_evolved_get_disqus_count(); 28 29 $total_count = $total_count + $wordpress_count + $gplus_count + $trackback_count + $facebook_count + $disqus_count; 25 30 return $total_count; 26 31 } 27 add_filter('get_comments_number', 'comments_evolved_get_total_count' );32 add_filter('get_comments_number', 'comments_evolved_get_total_count', 4269); 28 33 29 34 function comments_evolved_get_wordpress_count() { 30 global $post, $comments, $wp_query, $comments_by_type; 31 return count($wp_query->comments_by_type['comment']); 35 global $post, $comments, $wp_query, $comments_by_type, $id; 36 $get_comments= get_comments('post_id=' . $id); 37 $comments_by_type = &separate_comments($get_comments); 38 return count($comments_by_type['comment']); 32 39 } 33 40 … … 43 50 $json = json_decode($link_body); 44 51 return $json->$url->comments; 52 } 53 54 function comments_evolved_get_disqus_count($url = "") { 55 if(empty($url)){ $url = get_permalink(); } 56 $options = get_option("comments-evolved"); 57 if(!empty($options["disqus_shortname"])){ 58 $link = 'http://disqus.com/api/3.0/threads/details.json?api_key=qaoZg7DHagkn8xUf9ZqYRacHZI3CuBmGpu5InMmtXgtRzCnq6iGwtn7Fbwq1uysH&forum=' . $options["disqus_shortname"] . '&thread:link=' . urlencode($url); 59 $link_body = wp_remote_retrieve_body(wp_remote_get($link)); 60 $json = json_decode($link_body); 61 if(!empty($json)){ 62 return $json->response->posts; 63 } 64 } 65 return 0; 45 66 } 46 67 -
gplus-comments/trunk/includes/lib/plugin.php
r743641 r744243 42 42 43 43 function comments_evolved_shortcode($atts) { 44 extract( shortcode_atts( array( 'width' => '600', ), $atts ) ); 45 44 //extract( shortcode_atts( array( 'width' => '600', ), $atts ) ); 46 45 ob_start(); 47 46 include(COMMENTS_EVOLVED_TEMPLATES . '/container.php'); -
gplus-comments/trunk/includes/templates/container.php
r744120 r744243 30 30 </script> 31 31 <div id="comment-tabs"> 32 <a name="comments"></a> 32 33 <?php 33 34 if(!empty($options['comment_area_label'])) { … … 48 49 $trackback_count = comments_evolved_get_trackback_count(); 49 50 $facebook_count = comments_evolved_get_facebook_count(); 51 $disqus_count = comments_evolved_get_disqus_count(); 50 52 51 53 foreach ($tab_order as &$tab) { -
gplus-comments/trunk/readme.txt
r744196 r744243 7 7 Requires at least: 3.5 8 8 Tested up to: 3.6 9 Stable Tag: 1.5. 49 Stable Tag: 1.5.5 10 10 11 11 Comments Evolved ( formerly Google+ Comments for WordPress ) makes the comment section tabbed seamlessly adding tabs for Comments & More … … 103 103 104 104 == Change Log == 105 = 1.5.5 = 106 * udates to the disqus comment count 107 * fixes for the comment count total 108 105 109 = 1.5.4 = 106 110 * even more css fixes
Note: See TracChangeset
for help on using the changeset viewer.