Merge pull request #1443 from fabrixxm/issue-1437

Use correct class name to send post to email recipients. Fix #1437

diff --git a/CHANGELOG b/CHANGELOG
index 4f0c2323333265d349bd58b0e65d004dfee227fa..f130173a23e36b88ed9638b548fa4d785410b79b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.4
+
+       #TODO List changes.
+
 Version 3.3.3
     
        More separation between php and html in photo album (issue #1258) (rabuzarus)

diff --git a/boot.php b/boot.php
index 5a5437175ef26a9cdd26d541b41be75b23a6096a..9f6598e927b97fd3da929e96142c041d111a9994 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -16,7 +16,7 @@ require_once('include/dbstructure.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Ginger');
-define ( 'FRIENDICA_VERSION',      '3.3.3' );
+define ( 'FRIENDICA_VERSION',      '3.4.0' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1182      );
 define ( 'EOL',                    "<br />\r\n"     );

diff --git a/include/tags.php b/include/tags.php
index fc1b57db4b9343da5ac0e41735fd6b0eed9d96f0..a8bcae86dcc3783c13bbbc8ab6466517db431f1e 100644 (file)
--- a/include/tags.php
+++ b/include/tags.php
@@ -37,6 +37,9 @@ function create_tags_from_item($itemid) {
 
        $data = " ".$message["title"]." ".$message["body"]." ".$tags." ";
 
+       // ignore anything in a code block
+       $data = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$data);
+
        $tags = array();
 
        $pattern = "/\W\#([^\[].*?)[\s'\".,:;\?!\[\]\/]/ism";

diff --git a/index.php b/index.php
index 295db01da2138b42d4ae0caee25e1a7a544eec32..a4a86244332415168f5b47a0456e15190cd65cd9 100644 (file)
--- a/index.php
+++ b/index.php
@@ -115,7 +115,6 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
  *
  * What we really need to do is output the raw headers ourselves so we can keep them separate.
  *
-
  */
 
 // header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');