Merge branch 'master' of https://github.com/friendica/friendica
Conflicts: include/config.php update.php
This commit is contained in:
commit
355c42cb30
1809 changed files with 48636 additions and 6998 deletions
7
mod/viewsrc.php
Executable file → Normal file
7
mod/viewsrc.php
Executable file → Normal file
|
|
@ -25,7 +25,12 @@ function viewsrc_content(&$a) {
|
|||
);
|
||||
|
||||
if(count($r))
|
||||
$o .= str_replace("\n",'<br />',$r[0]['body']);
|
||||
if(is_ajax()) {
|
||||
echo str_replace("\n",'<br />',$r[0]['body']);
|
||||
killme();
|
||||
} else {
|
||||
$o .= str_replace("\n",'<br />',$r[0]['body']);
|
||||
}
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue