From 3eacd7aab37421c40a5647aee9acdbc58615ab4e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 2 Feb 2013 15:08:11 -0800
Subject: debugging the photo api

---
 boot.php           | 1 -
 include/photos.php | 8 ++++----
 mod/network.php    | 4 ++--
 mod/photos.php     | 2 +-
 version.inc        | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/boot.php b/boot.php
index 8b16882fc..daec5a09f 100644
--- a/boot.php
+++ b/boot.php
@@ -797,7 +797,6 @@ if(! class_exists('App')) {
 					}
 				}
 			}
-			logger('widgets: ' . print_r($this->widgets,true));
 		}
 
 		function get_widgets($location = '') {
diff --git a/include/photos.php b/include/photos.php
index 8e07c612f..c6e54517a 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -207,8 +207,8 @@ function photo_upload($channel, $observer, $args) {
 	$arr['deny_gid']      = $str_group_deny;
 
 
-	$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' 
-				. '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]' 
+	$arr['body']          = '[url=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' 
+				. '[img]' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]' 
 				. '[/url]';
 		
 	$item_id = item_store($arr);
@@ -347,8 +347,8 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) {
 	$arr['deny_cid']      = $photo['deny_cid'];
 	$arr['deny_gid']      = $photo['deny_gid'];
 			
-	$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' 
-		. '[img]' . $a->get_baseurl() . '/photo/' . $photo['resource_id'] . '-' . $photo['scale'] . '[/img]' 
+	$arr['body']          = '[url=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' 
+		. '[img]' . z_root() . '/photo/' . $photo['resource_id'] . '-' . $photo['scale'] . '[/img]' 
 		. '[/url]';
 		
 	$item_id = item_store($arr);
diff --git a/mod/network.php b/mod/network.php
index 4176f0047..cca69dc52 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -707,8 +707,8 @@ function network_content(&$a, $update = 0, $load = false) {
 	if(! $update) 
         $o .= alt_pager($a,count($items));
 
-	logger('parent dba_timer: ' . sprintf('%01.4f',$first - $start));
-	logger('child  dba_timer: ' . sprintf('%01.4f',$second - $first));
+//	logger('parent dba_timer: ' . sprintf('%01.4f',$first - $start));
+//	logger('child  dba_timer: ' . sprintf('%01.4f',$second - $first));
 
 
 	return $o;
diff --git a/mod/photos.php b/mod/photos.php
index 101cb20b2..e74ced67c 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -65,7 +65,7 @@ function photos_post(&$a) {
 
 	$page_owner_uid = $a->data['channel']['channel_id'];
 
-	if($a->perms['post_photos'])
+	if(perm_is_allowed($page_owner_uid,get_observer_hash(),'post_photos'))
 		$can_post = true;
 
 	if(! $can_post) {
diff --git a/version.inc b/version.inc
index c1c5fa011..8e6841d7f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-02-01.218
+2013-02-02.219
-- 
cgit v1.2.3