Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
feeds
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
drupal.org
feeds
Commits
7b64efbc
Commit
7b64efbc
authored
14 years ago
by
Alex Barth
Browse files
Options
Downloads
Patches
Plain Diff
#887846 ekes: Make FeedsSimplePieEnclosure (un)serialization safe.
parent
feaf0c62
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.txt
+1
-0
1 addition, 0 deletions
CHANGELOG.txt
plugins/FeedsSimplePieParser.inc
+21
-0
21 additions, 0 deletions
plugins/FeedsSimplePieParser.inc
with
22 additions
and
0 deletions
CHANGELOG.txt
+
1
−
0
View file @
7b64efbc
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
Feeds 6.x xxxxxxxxxxxxxxxxxxxxxx
Feeds 6.x xxxxxxxxxxxxxxxxxxxxxx
--------------------------------
--------------------------------
- #887846 ekes: Make FeedsSimplePieEnclosure (un)serialization safe.
- #908582 XiaN Vizjereij, alex_b: Fix "Cannot use object of type stdClass as
- #908582 XiaN Vizjereij, alex_b: Fix "Cannot use object of type stdClass as
array" error in mappers/taxonomy.inc.
array" error in mappers/taxonomy.inc.
- #906654 alex_b: Fix phantom subscriptions.
- #906654 alex_b: Fix phantom subscriptions.
...
...
This diff is collapsed.
Click to expand it.
plugins/FeedsSimplePieParser.inc
+
21
−
0
View file @
7b64efbc
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
*/
*/
class
FeedsSimplePieEnclosure
extends
FeedsEnclosure
{
class
FeedsSimplePieEnclosure
extends
FeedsEnclosure
{
protected
$simplepie_enclosure
;
protected
$simplepie_enclosure
;
private
$_serialized_simplepie_enclosure
;
/**
/**
* Constructor requires SimplePie enclosure object.
* Constructor requires SimplePie enclosure object.
...
@@ -14,6 +15,26 @@ class FeedsSimplePieEnclosure extends FeedsEnclosure {
...
@@ -14,6 +15,26 @@ class FeedsSimplePieEnclosure extends FeedsEnclosure {
$this
->
simplepie_enclosure
=
$enclosure
;
$this
->
simplepie_enclosure
=
$enclosure
;
}
}
/**
* Serialization helper.
*
* Handle the simplepie enclosure class seperately ourselves.
*/
public
function
__sleep
()
{
$this
->
_serialized_simplepie_enclosure
=
serialize
(
$this
->
simplepie_enclosure
);
return
array
(
'_serialized_simplepie_enclosure'
);
}
/**
* Unserialization helper.
*
* Ensure that the simplepie class definitions are loaded for the enclosure when unserializing.
*/
public
function
__wakeup
()
{
feeds_include_library
(
'simplepie.inc'
,
'simplepie'
);
$this
->
simplepie_enclosure
=
unserialize
(
$this
->
_serialized_simplepie_enclosure
);
}
/**
/**
* Override parent::getValue().
* Override parent::getValue().
*/
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment