summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorpickupman <jomcfred@gmail.com>2012-08-19 17:15:01 +0200
committerpickupman <jomcfred@gmail.com>2012-08-19 17:15:01 +0200
commit0f8a7930fef43f26a856035be1922577722bf51e (patch)
treeadceeee7861f8a93522cf57c281f08eca270f8b0 /system
parent6c94c2dcfb6557947c9ac67e419b2856fd80e01d (diff)
parent58854c372175552bb9e360deace7eeb52cdda059 (diff)
Merging heads
Diffstat (limited to 'system')
-rw-r--r--system/helpers/download_helper.php5
-rw-r--r--system/helpers/html_helper.php2
2 files changed, 5 insertions, 2 deletions
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 09c4de578..0232adfe4 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -95,7 +95,10 @@ if ( ! function_exists('force_download'))
}
// Clean output buffer
- ob_clean();
+ if (ob_get_level() !== 0)
+ {
+ ob_clean();
+ }
// Generate the server headers
header('Content-Type: '.$mime);
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 9843e804e..2372e8174 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -215,7 +215,7 @@ if ( ! function_exists('img'))
}
}
- return $img._stringify_attributes($attributes).'/>';
+ return $img._stringify_attributes($attributes).' />';
}
}