aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/conversation.php5
-rw-r--r--mod/profiles.php10
-rw-r--r--version.inc2
3 files changed, 12 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 25a2911e9..f348e56a2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -235,6 +235,7 @@ function localize_item(&$item){
$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
}
}
+
// add zrl's to public images
if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
foreach($matches as $mtch) {
@@ -248,11 +249,9 @@ function localize_item(&$item){
if($x) {
$sparkle = false;
$y = best_link_url($item,$sparkle,true);
- if(strstr($y,'/redir/'))
+ if($sparkle)
$item['plink'] = $y . '?f=&url=' . $item['plink'];
}
-
-
}
/**
diff --git a/mod/profiles.php b/mod/profiles.php
index 4df8a5af7..61f525e0f 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -385,9 +385,17 @@ function profile_activity($changed, $value) {
$arr['deny_gid'] = $a->user['deny_gid'];
$i = item_store($arr);
- if($i)
+ if($i) {
+
+ // give it a permanent link
+ q("update item set plink = '%s' where id = %d limit 1",
+ dbesc($a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $i),
+ intval($i)
+ );
+
proc_run('php',"include/notifier.php","activity","$i");
+ }
}
diff --git a/version.inc b/version.inc
index f779f55b9..d9dc48a14 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-07-11.12
+2012-07-12.13