diff options
| author | friendica <info@friendica.com> | 2013-12-09 14:05:52 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-09 14:05:52 -0800 |
| commit | 75ebf06131e935795b7072acc012c9e37669eade (patch) | |
| tree | eeda74b3434fc593eff6dc4600bfd8924915021c /include | |
| parent | 31efbe2f466a323609f9ed8d38bb5fb6223e406b (diff) | |
| download | volse-hubzilla-75ebf06131e935795b7072acc012c9e37669eade.tar.gz volse-hubzilla-75ebf06131e935795b7072acc012c9e37669eade.tar.bz2 volse-hubzilla-75ebf06131e935795b7072acc012c9e37669eade.zip | |
some work on modularising the default profile photo so we can make them site selectable. Also red != friendica so we don't need all these friendica logos taking up space
Diffstat (limited to 'include')
| -rw-r--r-- | include/network.php | 2 | ||||
| -rw-r--r-- | include/photo/photo_driver.php | 6 | ||||
| -rwxr-xr-x | include/text.php | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/include/network.php b/include/network.php index dac039230..50f853ca0 100644 --- a/include/network.php +++ b/include/network.php @@ -548,7 +548,7 @@ function avatar_img($email) { call_hooks('avatar_lookup', $avatar); if(! $avatar['success']) - $avatar['url'] = $a->get_baseurl() . '/images/person-175.jpg'; + $avatar['url'] = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/175.jpg'; logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG); return $avatar['url']; diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index ba95266f9..8730b4298 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -576,9 +576,9 @@ function import_profile_photo($photo,$xchan) { $photo_failure = true; } if($photo_failure) { - $photo = $a->get_baseurl() . '/images/person-175.jpg'; - $thumb = $a->get_baseurl() . '/images/person-80.jpg'; - $micro = $a->get_baseurl() . '/images/person-48.jpg'; + $photo = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/175.jpg'; + $thumb = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/80.jpg'; + $micro = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/48.jpg'; $type = 'image/jpeg'; } diff --git a/include/text.php b/include/text.php index bd4376ce4..9254508a4 100755 --- a/include/text.php +++ b/include/text.php @@ -884,9 +884,7 @@ function smilies($s, $sample = false) { ':like', ':dislike', 'red#', - 'r#', - '~friendica' - + 'r#' ); $icons = array( @@ -923,8 +921,8 @@ function smilies($s, $sample = false) { '<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />', '<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />', '<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="red#" />matrix</strong></a>', - '<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="r#" />matrix</strong></a>', - '<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>' + '<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="r#" />matrix</strong></a>' + ); $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s); |