Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 1 insertions, 2 deletions

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 7ed1859a8..31a497f0f 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -32,8 +32,7 @@ function wall_upload_post(&$a) {
 
 	$observer = $a->get_observer();
 
-	$args = array( 'source' => 'editor', 'album' => t('Wall Photos'), 
-			'not_visible' => 1, 'contact_allow' => array($channel['channel_hash']));
+	$args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
 
  	$ret = photo_upload($channel,$observer,$args);