svn commit: r725674 - in /incubator/shindig/branches/1.0.x-incubating/php/src/social: converters/OutputAtomConverter.php servlet/DataServiceServlet.php

[chabotc]

Author: chabotc
Date: Thu Dec 11 04:39:29 2008
New Revision: 725674

URL: http://svn.apache.org/viewvc?rev=725674&view=rev
Log:
Sync w trunk

Modified:
    
incubator/shindig/branches/1.0.x-incubating/php/src/social/converters/OutputAtomConverter.php
    
incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/DataServiceServlet.php

Modified: 
incubator/shindig/branches/1.0.x-incubating/php/src/social/converters/OutputAtomConverter.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/php/src/social/converters/OutputAtomConverter.php?rev=725674&r1=725673&r2=725674&view=diff
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/php/src/social/converters/OutputAtomConverter.php
 (original)
+++ 
incubator/shindig/branches/1.0.x-incubating/php/src/social/converters/OutputAtomConverter.php
 Thu Dec 11 04:39:29 2008
@@ -139,7 +139,7 @@
    * @param string $nameSpace optional namespace to use when creating node
    * @return DOMElement node
    */
-  private function addNode(DOMElement $node, $name, $value = '', $attributes = 
false, $nameSpace = false) {
+  private function addNode($node, $name, $value = '', $attributes = false, 
$nameSpace = false) {
     return OutputBasicXmlConverter::addNode($this->doc, $node, $name, $value, 
$attributes, $nameSpace);
   }
 

Modified: 
incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/DataServiceServlet.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/DataServiceServlet.php?rev=725674&r1=725673&r2=725674&view=diff
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/DataServiceServlet.php
 (original)
+++ 
incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/DataServiceServlet.php
 Thu Dec 11 04:39:29 2008
@@ -136,13 +136,13 @@
     $outputFormat = strtolower(trim(! empty($_POST[self::$FORMAT_PARAM]) ? 
$_POST[self::$FORMAT_PARAM] : (! empty($_GET[self::$FORMAT_PARAM]) ? 
$_GET[self::$FORMAT_PARAM] : 'json')));
     switch ($outputFormat) {
       case 'xml':
-        if (Config::get('debug')) $this->setContentType('application/xml');
+        if (!Config::get('debug')) $this->setContentType('application/xml');
         return new OutputXmlConverter();
       case 'atom':
-        if (Config::get('debug')) 
$this->setContentType('application/atom+xml');
+        if (!Config::get('debug')) 
$this->setContentType('application/atom+xml');
         return new OutputAtomConverter();
       case 'json':
-        if (Config::get('debug')) $this->setContentType('application/json');
+        if (!Config::get('debug')) $this->setContentType('application/json');
         return new OutputJsonConverter();
       default:
         // if no output format is set, see if we can match an input format 
header
@@ -150,14 +150,14 @@
         if (isset($_SERVER['CONTENT_TYPE'])) {
           switch ($_SERVER['CONTENT_TYPE']) {
             case 'application/atom+xml':
-              if (Config::get('debug')) 
$this->setContentType('application/atom+xml');
+              if (!Config::get('debug')) 
$this->setContentType('application/atom+xml');
               return new OutputAtomConverter();
             case 'application/xml':
-              if (Config::get('debug')) 
$this->setContentType('application/xml');
+              if (!Config::get('debug')) 
$this->setContentType('application/xml');
               return new OutputXmlConverter();
             default:
             case 'application/json':
-              if (Config::get('debug')) 
$this->setContentType('application/json');
+              if (!Config::get('debug')) 
$this->setContentType('application/json');
               return new OutputJsonConverter();
           }
         }