Merge branch 'api-getarticles-sanitize' into 'master'

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index 8a00cdd55b087d7453f4708be2d875fae0bbeacd..96097c56ad2e3675921f564b86651a954fb9a60e 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -346,29 +346,26 @@
                while (true) {
                        $result = db_query("SELECT id, title, content FROM ttrss_entries WHERE tsvector_combined IS NULL ORDER BY id LIMIT $limit");
 
-                       if (db_num_rows($result) != 0) {
-                               while ($line = db_fetch_assoc($result)) {
-                                       $tsvector_combined = db_escape_string(mb_substr($line['title'] . ' ' . strip_tags($line['content']),
-                                               0, 1000000));
+                       while ($line = db_fetch_assoc($result)) {
+                          $tsvector_combined = db_escape_string(mb_substr($line['title'] . ' ' . strip_tags(str_replace('<', ' <', $line['content'])),
+                                       0, 1000000));
 
-                                       db_query("UPDATE ttrss_entries SET tsvector_combined = to_tsvector('english', '$tsvector_combined') WHERE id = " . $line["id"]);
-                               }
+                               db_query("UPDATE ttrss_entries SET tsvector_combined = to_tsvector('english', '$tsvector_combined') WHERE id = " . $line["id"]);
+                       }
 
-                               $processed += db_num_rows($result);
-                               print "Processed $processed articles...\n";
+                       $processed += db_num_rows($result);
+                       print "Processed $processed articles...\n";
 
-                       } else {
+                       if (db_num_rows($result) != $limit) {
                                echo "All done.\n";
                                break;
                        }
-
                }
-
        }
 
        if (isset($options["list-plugins"])) {
                $tmppluginhost = new PluginHost();
-               $tmppluginhost->load_all($tmppluginhost::KIND_ALL);
+               $tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
                $enabled = array_map("trim", explode(",", PLUGINS));
 
                echo "List of all available plugins:\n";