From: Andrew Dolgov Date: Sat, 21 Feb 2015 10:08:50 +0000 (+0300) Subject: remove AUTO_ASSIGN_LABELS (confusing, idiots keep enable it and complain of the results) X-Git-Tag: 16.3~355 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e6c826fa2f17a900e06b316836326eee58330265;p=tt-rss.git remove AUTO_ASSIGN_LABELS (confusing, idiots keep enable it and complain of the results) --- diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index da11f55e..096260bf 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -23,7 +23,6 @@ class Pref_Prefs extends Handler_Protected { $this->pref_help = array( "ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate articles"), ""), - "AUTO_ASSIGN_LABELS" => array(__("Assign articles to labels automatically"), ""), "BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("When auto-detecting tags in articles these tags will not be applied (comma-separated list).")), "CDM_AUTO_CATCHUP" => array(__("Automatically mark articles as read"), __("This option enables marking articles as read automatically while you scroll article list.")), "CDM_EXPANDED" => array(__("Automatically expand articles in combined mode"), ""), diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 9d3d89c7..f80bcbb2 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -1091,20 +1091,6 @@ db_query("COMMIT"); } - if (get_pref("AUTO_ASSIGN_LABELS", $owner_uid, false)) { - _debug("auto-assigning labels...", $debug_enabled); - - foreach ($labels as $label) { - $caption = preg_quote($label["caption"]); - - if ($caption && preg_match("/\b$caption\b/i", "$tags_str " . strip_tags($entry_content) . " $entry_title")) { - if (!labels_contains_caption($article_labels, $caption)) { - label_add_article($entry_ref_id, $caption, $owner_uid); - } - } - } - } - _debug("article processed", $debug_enabled); }