diff options
| author | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
| commit | 3b96b0ed7cf8d960dd3ec2208ad8addb584bc1c9 (patch) | |
| tree | d83db38f58511d5648b6bd665ab3760d74e73875 /include/functions.php | |
| parent | ef3a8db1cc83e02a9f8933869d19f299f2abe72a (diff) | |
| parent | e4e9ac1fc288d6715f6419cd4c8a44386362ecf0 (diff) | |
Merge branch 'master' into hookhead
Conflicts:
include/functions.php
changes for conflicts with master
Diffstat (limited to 'include/functions.php')
| -rw-r--r-- | include/functions.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/functions.php b/include/functions.php index eb011b6db..556b8a8cd 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2578,8 +2578,10 @@ } } + $content_query_part = "content, content AS content_preview, cached_content, "; + if (is_numeric($feed)) { if ($feed >= 0) { @@ -3784,7 +3786,7 @@ * @return string Absolute URL */ function rewrite_relative_url($url, $rel_url) { - if (strpos($rel_url, "magnet:") === 0) { + if (strpos($rel_url, ":") !== false) { return $rel_url; } else if (strpos($rel_url, "://") !== false) { return $rel_url; @@ -3954,6 +3956,7 @@ $reg_qpart = "REGEXP"; foreach ($filter["rules"] AS $rule) { + $rule['reg_exp'] = str_replace('/', '\/', $rule["reg_exp"]); $regexp_valid = preg_match('/' . $rule['reg_exp'] . '/', $rule['reg_exp']) !== FALSE; |