From 289c44141d7d6aabd924f6543c1a49df5b3444c4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Wed, 21 May 2008 07:57:27 -0400
Subject: default avatar

darcs-hash:20080521115727-84dde-73b58873e08c936139bd63cffab0c30883c9f8a5.gz
---
 actions/showstream.php    |  5 +++--
 actions/subscribed.php    |  5 +++--
 actions/subscriptions.php | 17 ++++++++++-------
 3 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'actions')

diff --git a/actions/showstream.php b/actions/showstream.php
index 5a04e9f47..30930de25 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -143,7 +143,8 @@ class ShowstreamAction extends StreamAction {
 	}
 
 	function show_subscriptions($profile) {
-
+		global $config;
+		
 		# XXX: add a limit
 		$subs = $profile->getLink('id', 'subscription', 'subscriber');
 
@@ -166,7 +167,7 @@ class ShowstreamAction extends StreamAction {
 												'href' => $subs->profileurl,
 												'class' => 'subscription'));
 				$avatar = $subs->getAvatar(AVATAR_MINI_SIZE);
-				common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_MINI_AVATAR),
+				common_element('img', array('src' => (($avatar) ? $avatar->url : $config['avatar']['default']['mini']),
 											'width' => AVATAR_MINI_SIZE,
 											'height' => AVATAR_MINI_SIZE,
 											'class' => 'avatar mini',
diff --git a/actions/subscribed.php b/actions/subscribed.php
index 160267838..659118fb9 100644
--- a/actions/subscribed.php
+++ b/actions/subscribed.php
@@ -42,7 +42,8 @@ class SubscribedAction extends Action {
 	}
 
 	function show_subscribed($profile, $page) {
-
+		global $config;
+		
 		$subs = DB_DataObject::factory('subscription');
 		$subs->subscribed = $profile->id;
 
@@ -68,7 +69,7 @@ class SubscribedAction extends Action {
 											'href' => $subs->profileurl,
 											'class' => 'subscription'));
 			$avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
-			common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR),
+			common_element('img', array('src' => (($avatar) ? $avatar->url : $config['avatar']['default']['stream']),
 										'width' => AVATAR_STREAM_SIZE,
 										'height' => AVATAR_STREAM_SIZE,
 										'class' => 'avatar stream',
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 37ed68a7f..c15bd5310 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -65,13 +65,16 @@ class SubscriptionsAction extends Action {
 											'href' => $subs->profileurl,
 											'class' => 'subscription'));
 			$avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
-			common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR),
-										'width' => AVATAR_STREAM_SIZE,
-										'height' => AVATAR_STREAM_SIZE,
-										'class' => 'avatar stream',
-										'alt' => ($subs->fullname) ?
-										$subs->fullname :
-										$subs->nickname));
+			common_element('img', 
+						   array('src' => 
+								 (($avatar) ? $avatar->url : 
+								  $config['avatar']['default']['stream']),
+								 'width' => AVATAR_STREAM_SIZE,
+								 'height' => AVATAR_STREAM_SIZE,
+								 'class' => 'avatar stream',
+								 'alt' => ($subs->fullname) ?
+								 $subs->fullname :
+								 $subs->nickname));
 			common_element_end('a');
 
 			# XXX: subscribe form here
-- 
cgit v1.2.3-54-g00ecf