Merge branch 'master' into themetests

1 files changed, 13 insertions, 0 deletions

diff --git a/boot.php b/boot.php
index 3dff39a33..322a4e307 100644
--- a/boot.php
+++ b/boot.php
@@ -2449,3 +2449,16 @@ function feed_salmonlinks($nick) {
 	return $salmon;
 }}
 
+if(! function_exists('get_plink')) {
+function get_plink($item) {
+	$a = get_app();	
+	$plink = (((x($item,'plink')) && (! $item['private'])) ? '<div class="wall-item-links-wrapper"><a href="' 
+			. $item['plink'] . '" title="' . t('link to source') . '"><img src="' . $a->get_baseurl() . '/images/remote-link.gif" alt="' . t('link to source') . '" /></a></div>' : '');
+	return $plink;
+}}
+
+if(! function_exists('unamp')) {
+function unamp($s) {
+	return str_replace('&amp;', '&', $s);
+}}
+