Merge remote-tracking branch 'upstream/develop' into 1701-curl-range
Conflicts: mod/oexchange.php mod/uimport.php
This commit is contained in:
commit
e67133ef56
162 changed files with 798 additions and 757 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
function uexport_init(App &$a){
|
||||
function uexport_init(App $a) {
|
||||
if (! local_user()) {
|
||||
killme();
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@ function uexport_init(App &$a){
|
|||
}
|
||||
|
||||
/// @TODO Change space -> tab where wanted
|
||||
function uexport_content(App &$a){
|
||||
function uexport_content(App $a) {
|
||||
|
||||
if ($a->argc > 1) {
|
||||
header("Content-type: application/json");
|
||||
|
|
@ -130,7 +130,7 @@ function uexport_account($a){
|
|||
/**
|
||||
* echoes account data and items as separated json, one per line
|
||||
*/
|
||||
function uexport_all(App &$a) {
|
||||
function uexport_all(App $a) {
|
||||
|
||||
uexport_account($a);
|
||||
echo "\n";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue