public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-15 22:55:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of http://github.com/gothfox/Tiny-Tiny-RSS

Browse Source 
updating from github]
This commit is contained in:
justauser
2013-07-07 13:54:10 -04:00
parent 47fecba235 1016a4ef38
commit e4e9ac1fc2
10 changed files with 81 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/functions.php
View File

@@ -3788,7 +3788,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;
@@ -3958,6 +3958,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;