strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rolling version number in preparation for release

Browse source
This commit is contained in:
Friendika 2011-05-09 16:51:25 -07:00
parent be84d51767
commit cb6c1f91b7
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
addon/facebook/facebook.php
View file

@ -120,7 +120,7 @@ function fb_get_friends($uid) {
return; return;
$s = fetch_url('https://graph.facebook.com/me/friends?access_token=' . $access_token); $s = fetch_url('https://graph.facebook.com/me/friends?access_token=' . $access_token);
if($s) { if($s) {
logger('facebook: fb_get_friends: ' . $s); logger('facebook: fb_get_friends: ' . $s, LOGGER_DATA);
$j = json_decode($s); $j = json_decode($s);
logger('facebook: fb_get_friends: json: ' . print_r($j,true), LOGGER_DATA); logger('facebook: fb_get_friends: json: ' . print_r($j,true), LOGGER_DATA);
foreach($j->data as $person) { foreach($j->data as $person) {

3
boot.php
View file

@ -3,7 +3,8 @@
set_time_limit(0); set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000); 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 ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1054 ); define ( 'DB_UPDATE_VERSION', 1054 );

11
mod/photo.php
View file

@ -19,6 +19,11 @@ function photo_init(&$a) {
$default = 'images/default-profile.jpg'; $default = 'images/default-profile.jpg';
if(isset($type)) { if(isset($type)) {
/**
* Profile photos
*/
switch($type) { switch($type) {
case 'profile': case 'profile':
@ -50,6 +55,10 @@ function photo_init(&$a) {
} }
else { else {
/**
* Other photos
*/
$resolution = 0; $resolution = 0;
$photo = str_replace('.jpg','',$photo); $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 // 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 // them know permissions was denied. It may be possible to view the image
// through an authenticated profile visit. // 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 // 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. // might be able to obtain permission to view it.