From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.
---
interface/lib/classes/simplepie.inc.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php
index 6ddc0e0..564fad5 100644
--- a/interface/lib/classes/simplepie.inc.php
+++ b/interface/lib/classes/simplepie.inc.php
@@ -10865,7 +10865,7 @@
return $output . $data;
}
- function parse_date($dt)
+ static function parse_date($dt)
{
$parser = SimplePie_Parse_Date::get();
return $parser->parse($dt);
@@ -12151,7 +12151,7 @@
}
else
{
- $this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?');
+ $this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?&=');
}
$this->valid[__FUNCTION__] = true;
return true;
@@ -13065,7 +13065,7 @@
*
* @access public
*/
- function get()
+ static function get()
{
static $object;
if (!$object)
--
Gitblit v1.9.1