summaryrefslogtreecommitdiff
path: root/includes/common.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-10-23 09:47:53 +0000
committerDries Buytaert <dries@buytaert.net>2005-10-23 09:47:53 +0000
commit7f01d4f02ba2b7b54fa529574245c493058ff4f5 (patch)
treeb29d6e55cb39a0c650d9cb524fcef4d7c0b1d75b /includes/common.inc
parentfa11f2b9ca402f07d29b17dc263d163c629c243c (diff)
downloadbrdo-7f01d4f02ba2b7b54fa529574245c493058ff4f5.tar.gz
brdo-7f01d4f02ba2b7b54fa529574245c493058ff4f5.tar.bz2
- Patch #34907 by gtcaz: "Array" printed in each region.
Diffstat (limited to 'includes/common.inc')
-rw-r--r--includes/common.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc
index f3e95a2fe..7eb689261 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -51,10 +51,12 @@ function drupal_set_content($region = null, $data = null) {
* @param $delimiter
* Content to be inserted between exploded array elements.
*/
-function drupal_get_content($region = null, $delimiter = ' ') {
+function drupal_get_content($region = NULL, $delimiter = ' ') {
$content = drupal_set_content();
- if (isset($region) && isset($content[$region]) && is_array($content[$region])) {
+ if (isset($region)) {
+ if (isset($content[$region]) && is_array($content[$region])) {
return implode ($delimiter, $content[$region]);
+ }
}
else {
foreach (array_keys($content) as $region) {