merge r9742 from trunk to branch 2.1
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:
parent
805aeeb5cc
commit
f0550e906c
2 changed files with 3 additions and 2 deletions
|
@ -371,6 +371,7 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
|
||||||
|
|
||||||
@header('Content-Type: '.$contentType.'; charset='.get_pwg_charset());
|
@header('Content-Type: '.$contentType.'; charset='.get_pwg_charset());
|
||||||
print_r($encodedResponse);
|
print_r($encodedResponse);
|
||||||
|
trigger_action('sendResponse', $encodedResponse );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -576,4 +577,4 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
|
@ -175,7 +175,7 @@ function ws_std_get_image_xml_attributes()
|
||||||
function ws_getVersion($params, &$service)
|
function ws_getVersion($params, &$service)
|
||||||
{
|
{
|
||||||
global $conf;
|
global $conf;
|
||||||
if ($conf['show_version'])
|
if ($conf['show_version'] or is_admin() )
|
||||||
return PHPWG_VERSION;
|
return PHPWG_VERSION;
|
||||||
else
|
else
|
||||||
return new PwgError(403, 'Forbidden');
|
return new PwgError(403, 'Forbidden');
|
||||||
|
|
Loading…
Add table
Reference in a new issue