archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r9742 from trunk to branch 2.1

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


git-svn-id: http://piwigo.org/svn/branches/2.1@9914 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-03-29 10:54:15 +00:00
parent 805aeeb5cc
commit f0550e906c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/ws_core.inc.php
View file

@ -371,6 +371,7 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
@header('Content-Type: '.$contentType.'; charset='.get_pwg_charset());
print_r($encodedResponse);
trigger_action('sendResponse', $encodedResponse );
}
/**
@ -576,4 +577,4 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
return $res;
}
}
?>
?>

2
include/ws_functions.inc.php
View file

@ -175,7 +175,7 @@ function ws_std_get_image_xml_attributes()
function ws_getVersion($params, &$service)
{
global $conf;
if ($conf['show_version'])
if ($conf['show_version'] or is_admin() )
return PHPWG_VERSION;
else
return new PwgError(403, 'Forbidden');