X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fgallery.php;h=4f3c18ff91466135384f86e0b8a7a30df2c339fa;hb=7ad21d3cc1e4761e385a24df73ac4943242ce4f0;hp=4bc7baf5d4b730935570f1498bd2fd8f70397b78;hpb=4b2883832ef9bae8307c598adaa8f3a91d683c58;p=quix0rs-gnu-social.git

diff --git a/lib/gallery.php b/lib/gallery.php
index 4bc7baf5d4..4f3c18ff91 100644
--- a/lib/gallery.php
+++ b/lib/gallery.php
@@ -19,9 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-# 9x9
+# 10x8
 
-define('AVATARS_PER_PAGE', 81);
+define('AVATARS_PER_PAGE', 80);
 
 class GalleryAction extends Action {
 
@@ -50,20 +50,20 @@ class GalleryAction extends Action {
 	}
 
 	function no_such_user() {
-		$this->client_error(_t('No such user.'));
+		$this->client_error(_('No such user.'));
 	}
-	
+
 	function show_top($profile) {
-		common_element('p', 'instructions',
+		common_element('div', 'instructions',
 					   $this->get_instructions($profile));
 	}
-	
+
 	function show_gallery($profile, $page) {
 
 		$subs = new Subscription();
-		
+
 		$this->define_subs($subs, $profile);
-		
+
 		$subs->orderBy('created DESC');
 
 		# We ask for an extra one to know if we need to do another page
@@ -73,16 +73,16 @@ class GalleryAction extends Action {
 		$subs_count = $subs->find();
 
 		if ($subs_count == 0) {
-			common_element('p', _t('Nobody to show!'));
+			common_element('p', _('Nobody to show!'));
 			return;
 		}
-		
+
 		common_element_start('ul', $this->div_class());
 
 		for ($idx = 0; $idx < min($subs_count, AVATARS_PER_PAGE); $idx++) {
-			
+
 			$result = $subs->fetch();
-			
+
 			if (!$result) {
 				common_debug('Ran out of subscribers too early.', __FILE__);
 				break;
@@ -91,16 +91,16 @@ class GalleryAction extends Action {
 			$other = Profile::staticGet($this->get_other($subs));
 
 			common_element_start('li');
-			
+
 			common_element_start('a', array('title' => ($other->fullname) ?
 											$other->fullname :
 											$other->nickname,
 											'href' => $other->profileurl,
 											'class' => 'subscription'));
 			$avatar = $other->getAvatar(AVATAR_STREAM_SIZE);
-			common_element('img', 
-						   array('src' => 
-								 (($avatar) ? $avatar->url : 
+			common_element('img',
+						   array('src' =>
+								 (($avatar) ? common_avatar_display_url($avatar) :
 								  common_default_avatar(AVATAR_STREAM_SIZE)),
 								 'width' => AVATAR_STREAM_SIZE,
 								 'height' => AVATAR_STREAM_SIZE,
@@ -111,19 +111,19 @@ class GalleryAction extends Action {
 			common_element_end('a');
 
 			# XXX: subscribe form here
-			
+
 			common_element_end('li');
 		}
 
 		common_element_end('ul');
 
-		common_pagination($page > 1, 
+		common_pagination($page > 1,
 						  $subs_count > AVATARS_PER_PAGE,
-						  $page, 
-						  $this->trimmed('action'), 
+						  $page,
+						  $this->trimmed('action'),
 						  array('nickname' => $profile->nickname));
 	}
-	
+
 	function gallery_type() {
 		return NULL;
 	}
@@ -139,7 +139,7 @@ class GalleryAction extends Action {
 	function get_other(&$subs) {
 		return NULL;
 	}
-	
+
 	function div_class() {
 		return '';
 	}