diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-01-21 21:40:29 -0500 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-01-21 21:40:29 -0500 |
commit | b368e0a1f9715c6360748e9107f47bb5b117f04b (patch) | |
tree | dfc3d91e4fad927c12ddb6fcedf5cacc32a402bb /include/api.php | |
parent | dff2cdc650cd3e0fc706640c01492fce2d9640f7 (diff) | |
parent | dcaef756e7f9531bc4d1353b04ff44736032ffda (diff) | |
download | volse-hubzilla-b368e0a1f9715c6360748e9107f47bb5b117f04b.tar.gz volse-hubzilla-b368e0a1f9715c6360748e9107f47bb5b117f04b.tar.bz2 volse-hubzilla-b368e0a1f9715c6360748e9107f47bb5b117f04b.zip |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into activitystreams
Diffstat (limited to 'include/api.php')
-rw-r--r-- | include/api.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/api.php b/include/api.php index 5053977c5..ef41a4912 100644 --- a/include/api.php +++ b/include/api.php @@ -2106,10 +2106,10 @@ require_once('include/api_auth.php'); 'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl, 'shorturllength' => '30', 'hubzilla' => array( - 'PLATFORM_NAME' => PLATFORM_NAME, - 'RED_VERSION' => RED_VERSION, + 'PLATFORM_NAME' => get_platform_name(), + 'RED_VERSION' => get_project_version(), 'ZOT_REVISION' => ZOT_REVISION, - 'DB_UPDATE_VERSION' => DB_UPDATE_VERSION + 'DB_UPDATE_VERSION' => get_update_version() ) )); @@ -2142,12 +2142,12 @@ require_once('include/api_auth.php'); if($type === 'xml') { header("Content-type: application/xml"); - echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . RED_VERSION . '</version>' . "\r\n"; + echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . get_project_version() . '</version>' . "\r\n"; killme(); } elseif($type === 'json') { header("Content-type: application/json"); - echo '"' . RED_VERSION . '"'; + echo '"' . get_project_version() . '"'; killme(); } } |