diff --git a/CHANGELOG b/CHANGELOG index c6de0ae49a..4f0c232333 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -25,6 +25,11 @@ Version 3.3.3 Fix tools for translations (ddorian1) Fix API login via LDAP (issue #1286) (fabrixxm) Fix to link URL in tabs, pager (issues #1341, #1190) (ddorian1) + Fix poke activities translation (fabrixxm) + Fix html escaping in templates (fabrixxm) + Fix Friendica contacts shown as Diaspora contacts via Poco (annando) + Fix shared contacts wrong linking (issue #1388) (annando) + Fix email validation (ddorian1) Better documentation for developers (silke) Version 3.3.2 diff --git a/boot.php b/boot.php index 54ff948303..fbf4a90d29 100644 --- 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-RC' ); +define ( 'FRIENDICA_VERSION', '3.3.3' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1180 ); define ( 'EOL', "
\r\n" ); diff --git a/include/network.php b/include/network.php index 83d4c731a9..ab7a9c6297 100644 --- a/include/network.php +++ b/include/network.php @@ -651,7 +651,7 @@ function validate_email($addr) { return false; $h = substr($addr,strpos($addr,'@') + 1); - if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { + if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) { return true; } return false;