[geeklog-hg] geeklog: Fixed a bug where injected namespaces were gone (bug #0...

[geeklog-cvs at lists.geeklog.net]

changeset 9538:017347368a16
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/017347368a16
user: Kenji ITO <mystralkk at gmail.com>
date: Sun Aug 03 14:32:47 2014 +0900
description:
Fixed a bug where injected namespaces were gone (bug #0001777)

diffstat:

 system/lib-syndication.php |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r 23d1fb5054da -r 017347368a16 system/lib-syndication.php
--- a/system/lib-syndication.php	Sat Aug 02 18:28:54 2014 +0200
+++ b/system/lib-syndication.php	Sun Aug 03 14:32:47 2014 +0900
@@ -561,7 +561,11 @@
             $feed->system = 'Geeklog';
 
             /* Gather any other stuff */
-            $feed->namespaces = PLG_getFeedNSExtensions($A['type'], $format[0], $format[1], $A['topic'], $fid);
+            $feed->namespaces = array_merge(
+                $feed->namespaces,
+                PLG_getFeedNSExtensions($A['type'], $format[0], $format[1], $A['topic'], $fid)
+            );
+
             /* If the feed is RSS, and trackback is enabled */
             if( $_CONF['trackback_enabled'] && ($format[0] == 'RSS') )
             {