mirror of
https://github.com/friendica/friendica
synced 2024-12-23 02:40:17 +00:00
rolling version number in preparation for release
This commit is contained in:
parent
be84d51767
commit
cb6c1f91b7
3 changed files with 14 additions and 4 deletions
|
@ -120,7 +120,7 @@ function fb_get_friends($uid) {
|
|||
return;
|
||||
$s = fetch_url('https://graph.facebook.com/me/friends?access_token=' . $access_token);
|
||||
if($s) {
|
||||
logger('facebook: fb_get_friends: ' . $s);
|
||||
logger('facebook: fb_get_friends: ' . $s, LOGGER_DATA);
|
||||
$j = json_decode($s);
|
||||
logger('facebook: fb_get_friends: json: ' . print_r($j,true), LOGGER_DATA);
|
||||
foreach($j->data as $person) {
|
||||
|
|
3
boot.php
3
boot.php
|
@ -3,7 +3,8 @@
|
|||
set_time_limit(0);
|
||||
ini_set('pcre.backtrack_limit', 250000);
|
||||
|
||||
define ( 'FRIENDIKA_VERSION', '2.1.973' );
|
||||
|
||||
define ( 'FRIENDIKA_VERSION', '2.2.975' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
||||
define ( 'DB_UPDATE_VERSION', 1054 );
|
||||
|
||||
|
|
|
@ -19,6 +19,11 @@ function photo_init(&$a) {
|
|||
$default = 'images/default-profile.jpg';
|
||||
|
||||
if(isset($type)) {
|
||||
|
||||
/**
|
||||
* Profile photos
|
||||
*/
|
||||
|
||||
switch($type) {
|
||||
|
||||
case 'profile':
|
||||
|
@ -50,6 +55,10 @@ function photo_init(&$a) {
|
|||
}
|
||||
else {
|
||||
|
||||
/**
|
||||
* Other photos
|
||||
*/
|
||||
|
||||
$resolution = 0;
|
||||
$photo = str_replace('.jpg','',$photo);
|
||||
|
||||
|
@ -114,7 +123,7 @@ function photo_init(&$a) {
|
|||
// but who should otherwise be able to view it. Show a default image to let
|
||||
// them know permissions was denied. It may be possible to view the image
|
||||
// through an authenticated profile visit.
|
||||
// There won't be many complete unauthorised people seeing this because
|
||||
// There won't be many completely unauthorised people seeing this because
|
||||
// they won't have the photo link, so there's a reasonable chance that the person
|
||||
// might be able to obtain permission to view it.
|
||||
|
||||
|
|
Loading…
Reference in a new issue