diff options
| author | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
| commit | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (patch) | |
| tree | 477f3a8e84388aab2a4f3c938a166597c7467d19 /include/text.php | |
| parent | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (diff) | |
| parent | 247579ebf13ead372eee87bd2351078f7219321e (diff) | |
| download | volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.gz volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.bz2 volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.zip | |
Merge branch 'master' into tres
Conflicts:
mod/events.php
view/css/mod_events.css
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 1689dbef7..fc2f35135 100644 --- a/include/text.php +++ b/include/text.php @@ -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 ''; |