From e7663cef0f123d09d964b6d5177f8c0da081be1a Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 13 Nov 2012 07:34:55 -0500
Subject: [PATCH] Implemented: - added isset() checks to password encryption mode in remoting - if additional parameter "_ispconfig_pw_crypted" is set to "1" the password fields are not re-encrypted, this is useful when importing data from existing user-bases where no cleartext passwords are stored. Attention: crypted passwords need to have the same format or they won't work (i.e. CRYPT for CRYPT fields, PASSWORD() for mySQL fields)
---
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