projects
/
banana.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fixes deprecated features in PHP 5.3.x.
[banana.git]
/
banana
/
feed.inc.php
diff --git
a/banana/feed.inc.php
b/banana/feed.inc.php
index
9f177e7
..
e9125de
100644
(file)
--- a/
banana/feed.inc.php
+++ b/
banana/feed.inc.php
@@
-138,7
+138,7
@@
class BananaFeed
/** Merge to feeds into a new one
*/
- static public function &merge(
&$feed1, &
$feed2, $name, $description = null)
+ static public function &merge(
$feed1,
$feed2, $name, $description = null)
{
if (!$feed1) {
$feed = null;