svn commit: r954174 - /shindig/trunk/php/src/gadgets/GadgetSpecParser.php

[li...@apache.org]

Author: lindner
Date: Sun Jun 13 06:44:55 2010
New Revision: 954174

URL: http://svn.apache.org/viewvc?rev=954174&view=rev
Log:
SHINDIG-1301 | Patch from Shogo Kawahara | GadgetSpecParser doesn't fetch links within gadget specification

Modified:
    shindig/trunk/php/src/gadgets/GadgetSpecParser.php

Modified: shindig/trunk/php/src/gadgets/GadgetSpecParser.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/src/gadgets/GadgetSpecParser.php?rev=954174&r1=954173&r2=954174&view=diff
==============================================================================
--- shindig/trunk/php/src/gadgets/GadgetSpecParser.php (original)
+++ shindig/trunk/php/src/gadgets/GadgetSpecParser.php Sun Jun 13 06:44:55 2010
@@ -44,7 +44,6 @@ class GadgetSpecParser {
     $gadget = new GadgetSpec();
     $gadget->checksum = md5($xmlContent);
     $this->parseModulePrefs($doc, $gadget);
-    $this->parseLinks($doc, $gadget);
     $this->parseUserPrefs($doc, $gadget);
     $this->parseViews($doc, $gadget);
     //TODO: parse pipelined data
@@ -137,12 +136,12 @@ class GadgetSpecParser {
   /**
    * Parses the link spec elements
    *
-   * @param DOMDocument $doc
+   * @param DOMElement $modulePrefs
    * @param GadgetSpec $gadget
    */
-  private function parseLinks(DOMDocument &$doc, GadgetSpec &$gadget) {
+  private function parseLinks(DOMElement &$modulePrefs, GadgetSpec &$gadget) {
     $gadget->links = array();
-    if (($links = $doc->getElementsByTagName('link')) != null) {
+    if (($links = $modulePrefs->getElementsByTagName('Link')) != null) {
       foreach ($links as $linkNode) {
         $gadget->links[] = array('rel' => $linkNode->getAttribute('rel'),
             'href' => $linkNode->getAttribute('href'),
@@ -183,6 +182,7 @@ class GadgetSpecParser {
       }
     }
     // And parse the child nodes
+    $this->parseLinks($modulePrefs, $gadget);
     $this->parseIcon($modulePrefs, $gadget);
     $this->parseFeatures($modulePrefs, $gadget);
     $this->parsePreloads($modulePrefs, $gadget);