Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 11:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'upstream/master'

Browse source 
Conflicts:
	include/bb2diaspora.php
This commit is contained in:
Michael Vogel 2012-07-13 23:39:51 +02:00
commit bfca7f47ef
282 changed files with 35083 additions and 2632 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/network.php
View file

@ -605,6 +605,9 @@ function validate_url(&$url) {
if(! function_exists('validate_email')) {
function validate_email($addr) {
if(get_config('system','disable_email_validation'))
return true;
if(! strpos($addr,'@'))
return false;
$h = substr($addr,strpos($addr,'@') + 1);