Ticket #859: favatars.diff

.php

@@ -2 +2 @@
 /*
 Plugin Name: Favatars
 Plugin URI: http://dev.wp-plugins.org/wiki/favatars
-Description: A system to show favicon.ico files as avatars: "Favatars". Entire recode by <a href="http://www.thecodepro.com/">Jeff Minard</a> <br /> Previous Versions care of: <a href="http://www.noscope.com">Joen</a>, <a href="http://www.peej.co.uk/projects/favatars.html">Paul James</a>, and <a href="http://www.somefoolwitha.com">Matthew</a>. 
+Description: A system to show favicon.ico files as avatars: "Favatars". Entire recode by <a href="http://www.thecodepro.com/">Jeff Minard</a> (fixes for 2.5.x by <a href="http://perassi.org/">Carlo Perassi</a>).<br /> Previous Versions care of: <a href="http://www.noscope.com">Joen</a>, <a href="http://www.peej.co.uk/projects/favatars.html">Paul James</a>, and <a href="http://www.somefoolwitha.com">Matthew</a>. 
 Version: 2
 Author: Jeff Minard
 Author URI: http://thecodepro.com/
@@ -11 +11 @@
 // Nothing more to see here. All configuration is done via the admin panel.
 // Move along.
 
+global $comment, $wpdb;
+
 $comment_favicon_exists = fav_maybe_add_column($wpdb->comments, 'comment_favicon_url', "ALTER TABLE `$wpdb->comments` ADD `comment_favicon_url` TEXT NOT NULL");
 
 if( $comment_favicon_exists == false )
@@ -208 +210 @@
                 
                 DEFINE(SP,'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
                 
-                $request = "SELECT comment_ID, comment_author_url FROM $wpdb->comments WHERE comment_favicon_url = '' AND comment_author_url != '' ";
+                $request = "SELECT comment_ID, comment_author_url FROM $wpdb->comments WHERE ((comment_favicon_url = '') AND (comment_author_url != '') AND (comment_type != ''))";
 
             $comments = $wpdb->get_results($request);