mirror of
https://framagit.org/hubzilla/core.git
synced 2026-06-21 17:07:39 -04:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc9f41df5f | ||
|
|
bb3784d8dd | ||
|
|
c997360b4a | ||
|
|
88fa18204f |
@@ -1,3 +1,9 @@
|
||||
Hubzilla 4.4.1 (2019-08-16)
|
||||
- Fix wrong profile photo displayed when previewing and editing profiles
|
||||
- Fix regression from 4.4 which prevented encrypted signatures from being used for encrypted messages
|
||||
- Fix typo in queueworker addon which broke filtering of duplicate work
|
||||
|
||||
|
||||
Hubzilla 4.4 (2019-08-13)
|
||||
- Change primary directory from zotadel.net to hub.netzgemeinde.eu (requested by zotadel admin)
|
||||
- Add Russian context help files
|
||||
|
||||
2
boot.php
2
boot.php
@@ -50,7 +50,7 @@ require_once('include/attach.php');
|
||||
require_once('include/bbcode.php');
|
||||
|
||||
define ( 'PLATFORM_NAME', 'hubzilla' );
|
||||
define ( 'STD_VERSION', '4.4' );
|
||||
define ( 'STD_VERSION', '4.4.1' );
|
||||
define ( 'ZOT_REVISION', '6.0a' );
|
||||
|
||||
define ( 'DB_UPDATE_VERSION', 1234 );
|
||||
|
||||
@@ -1262,7 +1262,7 @@ function channel_export_items_page($channel_id, $start, $finish, $page = 0, $lim
|
||||
*/
|
||||
function profile_load($nickname, $profile = '') {
|
||||
|
||||
// logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));
|
||||
//logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));
|
||||
|
||||
$user = q("select channel_id from channel where channel_address = '%s' and channel_removed = 0 limit 1",
|
||||
dbesc($nickname)
|
||||
@@ -1303,6 +1303,14 @@ function profile_load($nickname, $profile = '') {
|
||||
dbesc($nickname),
|
||||
dbesc($profile)
|
||||
);
|
||||
if (! $p) {
|
||||
$p = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
|
||||
LEFT JOIN channel ON profile.uid = channel.channel_id
|
||||
WHERE channel.channel_address = '%s' AND profile.id = %d LIMIT 1",
|
||||
dbesc($nickname),
|
||||
intval($profile)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if(! $p) {
|
||||
|
||||
@@ -304,7 +304,7 @@ function zot_zot($url, $data, $channel = null,$crypto = null) {
|
||||
if($channel) {
|
||||
$headers['X-Zot-Token'] = random_string();
|
||||
$headers['X-Zot-Digest'] = \Zotlabs\Web\HTTPSig::generate_digest_header($data);
|
||||
$h = \Zotlabs\Web\HTTPSig::create_sig($headers,$channel['channel_prvkey'],'acct:' . channel_reddress($channel),false,'sha512',(($crypto) ? $crypto['hubloc_sitekey'] : ''), (($crypto) ? zot_best_algorithm($crypto['site_crypto']) : ''));
|
||||
$h = \Zotlabs\Web\HTTPSig::create_sig($headers,$channel['channel_prvkey'],'acct:' . channel_reddress($channel),false,'sha512',(($crypto) ? [ 'key' => $crypto['hubloc_sitekey'], 'algorithm' => $crypto['site_crypto'] ] : false));
|
||||
}
|
||||
|
||||
$redirects = 0;
|
||||
|
||||
Reference in New Issue
Block a user