aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-09 16:51:25 -0700
committerFriendika <info@friendika.com>2011-05-09 16:51:25 -0700
commitcb6c1f91b7b2b30c3d9e9f4e6c97b0704361a1f3 (patch)
tree31a15b662a2a0a9bdc556f44c2dc746890d18afd
parentbe84d51767366c4538a8203f0046cb5ac06396d6 (diff)
downloadvolse-hubzilla-cb6c1f91b7b2b30c3d9e9f4e6c97b0704361a1f3.tar.gz
volse-hubzilla-cb6c1f91b7b2b30c3d9e9f4e6c97b0704361a1f3.tar.bz2
volse-hubzilla-cb6c1f91b7b2b30c3d9e9f4e6c97b0704361a1f3.zip
rolling version number in preparation for release
-rw-r--r--addon/facebook/facebook.php2
-rw-r--r--boot.php5
-rw-r--r--mod/photo.php11
3 files changed, 14 insertions, 4 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index 8fe6f3717..2120459c3 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -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) {
diff --git a/boot.php b/boot.php
index dee3b82cf..2b9b209b4 100644
--- a/boot.php
+++ b/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 );
@@ -20,7 +21,7 @@ define ( 'DOWN_ARROW', '&#x21e9;' );
*
*/
-define ( 'JPEG_QUALITY', 100 );
+define ( 'JPEG_QUALITY', 100 );
/**
* SSL redirection policies
diff --git a/mod/photo.php b/mod/photo.php
index 2f8d180fd..3bea7e72d 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -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.