From 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 10:04:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
interface/lib/classes/simplepie.inc.php | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php
index 564fad5..4fcb2c3 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, '/');
@@ -9200,7 +9200,7 @@
return $return;
}
- function element_implode($element)
+ static function element_implode($element)
{
$full = "<$element[tag]";
foreach ($element['attribs'] as $key => $value)
@@ -9304,7 +9304,7 @@
die('Cached file for ' . $identifier_url . ' cannot be found.');
}
- function fix_protocol($url, $http = 1)
+ public static function fix_protocol($url, $http = 1)
{
$url = SimplePie_Misc::normalize_url($url);
$parsed = SimplePie_Misc::parse_url($url);
@@ -9336,7 +9336,7 @@
}
}
- function parse_url($url)
+ public static function parse_url($url)
{
$iri = new SimplePie_IRI($url);
return array(
@@ -9359,7 +9359,7 @@
return $iri->get_iri();
}
- function normalize_url($url)
+ public static function normalize_url($url)
{
$iri = new SimplePie_IRI($url);
return $iri->get_iri();
@@ -9428,7 +9428,7 @@
return strtr($string, $convert_table);
}
- function change_encoding($data, $input, $output)
+ public static function change_encoding($data, $input, $output)
{
$input = SimplePie_Misc::encoding($input);
$output = SimplePie_Misc::encoding($output);
@@ -9469,7 +9469,7 @@
}
}
- function encoding($charset)
+ public static function encoding($charset)
{
// Normalization from UTS #22
switch (strtolower(preg_replace('/(?:[^a-zA-Z0-9]+|([^0-9])0+)/', '\1', $charset)))
@@ -10785,7 +10785,7 @@
}
}
- function get_curl_version()
+ public static function get_curl_version()
{
if (is_array($curl = curl_version()))
{
@@ -10879,7 +10879,7 @@
* @param string $data Input data
* @return string Output data
*/
- function entities_decode($data)
+ static function entities_decode($data)
{
$decoder = new SimplePie_Decode_HTML_Entities($data);
return $decoder->parse();
@@ -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);
}
@@ -11245,7 +11245,7 @@
* @param string $data XML data
* @return array Possible encodings
*/
- function xml_encoding($data)
+ public static function xml_encoding($data)
{
// UTF-32 Big Endian BOM
if (substr($data, 0, 4) === "\x00\x00\xFE\xFF")
@@ -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