clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 

* remotes/upstream/master:
  viewsrc: return only body if page is requested via ajax

* master:
This commit is contained in:
Simon L'nu 2012-03-28 06:48:05 -04:00
parent 4a75ea2f42 77aeba0d12
commit 57ef21295a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -563,6 +563,10 @@ function absurl($path) {
return $path; return $path;
} }
function is_ajax() {
return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
}
// Primarily involved with database upgrade, but also sets the // Primarily involved with database upgrade, but also sets the
// base url for use in cmdline programs which don't have // base url for use in cmdline programs which don't have

5
mod/viewsrc.php
View File

@ -25,7 +25,12 @@ function viewsrc_content(&$a) {
); );
if(count($r)) if(count($r))
if(is_ajax()) {
echo str_replace("\n",'<br />',$r[0]['body']);
killme();
} else {
$o .= str_replace("\n",'<br />',$r[0]['body']); $o .= str_replace("\n",'<br />',$r[0]['body']);
}
return $o; return $o;
} }