Browse Source

Merge pull request #390 from adam-vessey/7.x-prevent-devel-query-log-issues

Set global to prevent query logging when outputting datastreams.
pull/391/merge
Jonathan Green 11 years ago
parent
commit
6a4ba3f835
  1. 7
      includes/datastream.inc

7
includes/datastream.inc

@ -30,6 +30,13 @@ function islandora_download_datastream(AbstractDatastream $datastream) {
* The version of the datastream to display * The version of the datastream to display
*/ */
function islandora_view_datastream(AbstractDatastream $datastream, $download = FALSE, $version = NULL) { function islandora_view_datastream(AbstractDatastream $datastream, $download = FALSE, $version = NULL) {
// XXX: Certain features of the Devel module rely on the use of "shutdown
// handlers", such as query logging... The problem is that they might blindly
// add additional output which will break things if what is actually being
// output is anything but a webpage... like an image or video or audio or
// whatever the datastream is here.
$GLOBALS['devel_shutdown'] = FALSE;
if ($version !== NULL) { if ($version !== NULL) {
if (isset($datastream[$version])) { if (isset($datastream[$version])) {
$datastream = $datastream[$version]; $datastream = $datastream[$version];

Loading…
Cancel
Save