Changeset 9914 for branches/2.1

Timestamp:

Mar 29, 2011, 12:54:15 PM (13 years ago)

Author:

plg

Message:

merge r9742 from trunk to branch 2.1

ws_getVersion -> add test for admin , sendResponse -> add a trigger for debug ws

Location:

branches/2.1/include

Files:

• ws_core.inc.php (modified) (1 diff)
• ws_functions.inc.php (modified) (1 diff)

branches/2.1/include/ws_core.inc.php

@@ -372 +372 @@
     @header('Content-Type: '.$contentType.'; charset='.get_pwg_charset());
     print_r($encodedResponse);
+    trigger_action('sendResponse', $encodedResponse );
   }
 

branches/2.1/include/ws_functions.inc.php

@@ -176 +176 @@
 {
   global $conf;
-  if ($conf['show_version'])
+  if ($conf['show_version'] or is_admin() )
     return PHPWG_VERSION;
   else