[Php-blog-plugin-cvs] additional_plugins/serendipity_event_spamblock_bayes ChangeLog, 1.6, 1.7 serendipity_event_spamblock_bayes.php, 1.6, 1.7

[onli <on...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_spamblock_bayes
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19487

Modified Files:
	ChangeLog serendipity_event_spamblock_bayes.php 
Log Message:

Bugfix for recycler-restore

Index: serendipity_event_spamblock_bayes.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_event_spamblock_bayes.php	23 May 2010 12:02:37 -0000	1.6
+++ serendipity_event_spamblock_bayes.php	25 May 2010 20:49:46 -0000	1.7
@@ -31,7 +31,7 @@
 		$this->title = PLUGIN_EVENT_SPAMBLOCK_BAYES_NAME;
 		$propbag->add ( 'description', PLUGIN_EVENT_SPAMBLOCK_BAYES_DESC);
 		$propbag->add ( 'name', $this->title);
-		$propbag->add ( 'version', '0.3.6' );
+		$propbag->add ( 'version', '0.3.6.1' );
 		$propbag->add ( 'event_hooks', array ('frontend_saveComment' => true,
 		                                     'backend_spamblock_comments_shown' => true,
 		                                     'external_plugin' => true,
@@ -982,7 +982,13 @@
             $columns = '*';
         } else {
             $columns = $include;
+            $include = array($include);
+        }
+
+        if ($select) {
+            $columns .= ", id";
         }
+            
         $sql = "SELECT " . $columns . "
                 FROM
                 {$serendipity['dbPrefix']}$table
@@ -1008,7 +1014,9 @@
             $names = array_keys($selectedTable[0]);
             $names = array_filter($names, create_function('$name', 'return ! is_numeric($name);'));
             foreach ($names as $name) {
-                $output .= "<th>$name</th>";
+                if (empty($include) || in_array($name, $include)) {
+                    $output .= "<th>$name</th>";
+                }
             }
             $output .= '</tr>
             </thead>';
@@ -1018,11 +1026,13 @@
                 if ($select) {
                     $output .= '<td class="select"><input type="checkbox" name="serendipity[selected]['.$column['id'].']" /></td>';
                 }
-                foreach ($names as $name) {
-                    if (isset($formatFunctions[$name])) {
-                        $output .= "<td class=\"$name\">". $formatFunctions[$name]($column[$name])."</td>";
-                    } else {
-                        $output .= "<td class=\"$name\">{$column[$name]}</td>";
+                foreach ($names as $name) {;
+                    if (empty($include) || in_array($name, $include)) {
+                        if (isset($formatFunctions[$name])) {
+                            $output .= "<td class=\"$name\">". $formatFunctions[$name]($column[$name])."</td>";
+                        } else {
+                            $output .= "<td class=\"$name\">{$column[$name]}</td>";
+                        }
                     }
                 }
                 $output .= '</tr>';

Index: ChangeLog
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_spamblock_bayes/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	23 May 2010 12:02:37 -0000	1.6
+++ ChangeLog	25 May 2010 20:49:46 -0000	1.7
@@ -1,3 +1,6 @@
+0.3.6.1:
+    * Fixing restore of recyclercontent
+
 0.3.6:
     * Upon Request: Added date to recycler
     * Added a "Mark all as ham"-button to the commentpage, using