harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tres

Browse Source 
Conflicts:
	mod/events.php
	view/css/mod_events.css
This commit is contained in:
friendica
2015-02-08 20:57:37 -08:00
parent 4b348d2489 247579ebf1
commit 08b757a22c
97 changed files with 9030 additions and 7689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/text.php
View File

@@ -1947,7 +1947,7 @@ function find_xchan_in_array($xchan,$arr) {
function get_rel_link($j,$rel) {
if(is_array($j) && ($j))
foreach($j as $l)
if(array_key_exists('rel',$j) && $l['rel'] === $rel && array_key_exists('href',$l))
if(array_key_exists('rel',$l) && $l['rel'] === $rel && array_key_exists('href',$l))
return $l['href'];
return '';