UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-03 11:43:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1130 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-04-06 12:25:29 -06:00 committed by GitHub
commit f7febfe0db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Util/ActivityPub/Helpers.php
View file

@ -341,8 +341,8 @@ class Helpers {
// pleroma attachment fix // pleroma attachment fix
$url = str_replace(' ', '%20', $url); $url = str_replace(' ', '%20', $url);
$img = file_get_contents($url, false, stream_context_create(['ssl' => ["verify_peer"=>false,"verify_peer_name"=>false]])); $img = file_get_contents($url, false, stream_context_create(['ssl' => ["verify_peer"=>true,"verify_peer_name"=>true]]));
$file = '/tmp/'.str_random(16).$info['basename']; $file = '/tmp/'.str_random(32);
file_put_contents($file, $img); file_put_contents($file, $img);
$fdata = new File($file); $fdata = new File($file);
$path = Storage::putFile($storagePath, $fdata, 'public'); $path = Storage::putFile($storagePath, $fdata, 'public');

2
config/pixelfed.php
View file

@ -23,7 +23,7 @@ return [
| This value is the version of your PixelFed instance. | This value is the version of your PixelFed instance.
| |
*/ */
'version' => '0.8.5', 'version' => '0.8.6',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------