From 72695f0356210b5ca68d33d09e91c00ed9d6c2b6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 12 Feb 2013 04:55:44 -0500
Subject: [PATCH] Merged Revisions 3771-3801 from stable branch.
---
interface/lib/classes/simplepie.inc.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php
index 564fad5..b0da004 100644
--- a/interface/lib/classes/simplepie.inc.php
+++ b/interface/lib/classes/simplepie.inc.php
@@ -9103,7 +9103,7 @@
return $time;
}
- function absolutize_url($relative, $base)
+ static function absolutize_url($relative, $base)
{
$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
return $iri->get_iri();
@@ -9163,7 +9163,7 @@
return $output . $input;
}
- function get_element($realname, $string)
+ static function get_element($realname, $string)
{
$return = array();
$name = preg_quote($realname, '/');
@@ -11006,7 +11006,7 @@
}
}
- function atom_10_construct_type($attribs)
+ static function atom_10_construct_type($attribs)
{
if (isset($attribs['']['type']))
{
@@ -11059,7 +11059,7 @@
}
}
- function is_isegment_nz_nc($string)
+ static function is_isegment_nz_nc($string)
{
return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string);
}
@@ -11699,7 +11699,7 @@
* @param string $relative Relative IRI
* @return SimplePie_IRI
*/
- function absolutize($base, $relative)
+ static function absolutize($base, $relative)
{
$relative = (string) $relative;
if ($relative !== '')
--
Gitblit v1.9.1