Merge branch 'reg_exp_length' of lllusion3418/tt-rss into master

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 6a12963902d80566e882beff125e4ca9d65e0330..b5e2eb77665a41d4e23cb5e45c40630973eb0972 100755 (executable)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
        define('EXPECTED_CONFIG_VERSION', 26);
-       define('SCHEMA_VERSION', 133);
+       define('SCHEMA_VERSION', 134);
 
        define('LABEL_BASE_INDEX', -1024);
        define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -500,7 +500,7 @@
                                  );
 
                        if (!$post_query && $last_modified) {
-                               $context_options['http']['header'] = "If-Modified-Since: $last_modified\r\n";
+                               array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
                        }
 
                        if (defined('_HTTP_PROXY')) {
@@ -1654,7 +1654,7 @@
                        }
                }
 
-               $allowed_elements = array('a', 'address', 'acronym', 'audio', 'article', 'aside',
+               $allowed_elements = array('a', 'abbr', 'address', 'acronym', 'audio', 'article', 'aside',
                        'b', 'bdi', 'bdo', 'big', 'blockquote', 'body', 'br',
                        'caption', 'cite', 'center', 'code', 'col', 'colgroup',
                        'data', 'dd', 'del', 'details', 'description', 'dfn', 'div', 'dl', 'font',