diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-02-25 02:05:16 +0100 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-02-25 02:05:16 +0100 |
| commit | f12b0fe316a4a1c285935a30b282ef82c1b0f6a5 (patch) | |
| tree | e95c1d6d5fb64315fa3afedf3132daf6fbeaaac5 /mod | |
| parent | 8944d7a7a226601e4b32ea7f7febc166a3ce272d (diff) | |
| parent | 6300f47cdcd921141b8f98b71d373d53aa3d80f2 (diff) | |
| download | volse-hubzilla-f12b0fe316a4a1c285935a30b282ef82c1b0f6a5.tar.gz volse-hubzilla-f12b0fe316a4a1c285935a30b282ef82c1b0f6a5.tar.bz2 volse-hubzilla-f12b0fe316a4a1c285935a30b282ef82c1b0f6a5.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/admin.php | 2 | ||||
| -rw-r--r-- | mod/xrd.php | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mod/admin.php b/mod/admin.php index 5195db320..292a4e66a 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1275,7 +1275,7 @@ function admin_page_plugins(&$a){ '$str_minversion' => t('Minimum project version: '), '$str_maxversion' => t('Maximum project version: '), '$str_minphpversion' => t('Minimum PHP version: '), - + '$str_requires' => t('Requires: '), '$disabled' => t('Disabled - version incompatibility'), '$admin_form' => $admin_form, diff --git a/mod/xrd.php b/mod/xrd.php index 34ed47149..da4ab51a4 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -35,8 +35,6 @@ function xrd_init(&$a) { header("Content-type: application/xrd+xml"); - $tpl = get_markup_template('view/xrd_person.tpl'); - $o = replace_macros(get_markup_template('xrd_person.tpl'), array( '$nick' => $r[0]['channel_address'], '$accturi' => $uri, @@ -51,7 +49,7 @@ function xrd_init(&$a) { // '$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'] . '/mention', '$modexp' => 'data:application/magic-public-key,' . $salmon_key, '$subscribe' => $a->get_baseurl() . '/follow?url={uri}', -// '$bigkey' => salmon_key($r[0]['pubkey']) + '$bigkey' => salmon_key($r[0]['channel_pubkey']) )); |