Merge https://github.com/friendica/red into zpull

2013-10-12 15:13:23 -07:00 · 2013-10-12 15:13:23 -07:00 · bb9feee370
commit bb9feee370
parent 55c43f12b5 7ffe4f6f91
3 changed files with 2911 additions and 2441 deletions
--- a/mod/item.php
+++ b/mod/item.php
@ -880,7 +880,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
 			$url = 'http://getzot.com';
 			$newtag = '#[zrl=' . $url . ']' . $basetag . '[/zrl]';
 			$body = str_replace($tag,$newtag,$body);
-			$replace = true;
+			$replaced = true;
 		}
 		else {
 			//base tag has the tags name only
--- a/view/it/messages.po
+++ b/view/it/messages.po
--- a/view/it/strings.php
+++ b/view/it/strings.php