diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-20 07:09:38 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-20 07:09:38 +0200 |
| commit | 07b599a683760d2542014bb04a681463420a3565 (patch) | |
| tree | cfcd06671529eeec7790fb70a8d490094d7942c9 /views/json | |
| parent | ea0140d87534c3b10e489d13a1449ebb79da832d (diff) | |
| parent | 174763bcbcd20812dc09f27b64908f9d71b523b9 (diff) | |
| download | elgg-07b599a683760d2542014bb04a681463420a3565.tar.gz elgg-07b599a683760d2542014bb04a681463420a3565.tar.bz2 | |
Merge branch 'lorea-preprod'
Conflicts:
.gitmodules
Diffstat (limited to 'views/json')
| -rw-r--r-- | views/json/export/entity.php | 5 | ||||
| -rw-r--r-- | views/json/group/default.php | 2 | ||||
| -rw-r--r-- | views/json/object/default.php | 2 | ||||
| -rw-r--r-- | views/json/site/default.php | 2 | ||||
| -rw-r--r-- | views/json/user/default.php | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/views/json/export/entity.php b/views/json/export/entity.php index 52cd9d244..36af5eaef 100644 --- a/views/json/export/entity.php +++ b/views/json/export/entity.php @@ -19,4 +19,7 @@ foreach ($exportable_values as $v) { $export->url = $entity->getURL(); global $jsonexport; -$jsonexport[$entity->getType()][$entity->getSubtype()][] = $export;
\ No newline at end of file +$jsonexport[$entity->getType()][$entity->getSubtype()][] = $export; + +// @todo hack to fix #4504 +echo "Fix for bug #4504"; diff --git a/views/json/group/default.php b/views/json/group/default.php index 0b168fdb2..dd190d402 100644 --- a/views/json/group/default.php +++ b/views/json/group/default.php @@ -6,4 +6,4 @@ * @subpackage Core */ -elgg_view('export/entity', $vars);
\ No newline at end of file +echo elgg_view('export/entity', $vars); diff --git a/views/json/object/default.php b/views/json/object/default.php index d2e807621..8b88b3010 100644 --- a/views/json/object/default.php +++ b/views/json/object/default.php @@ -6,4 +6,4 @@ * @subpackage Core */ -elgg_view('export/entity', $vars);
\ No newline at end of file +echo elgg_view('export/entity', $vars); diff --git a/views/json/site/default.php b/views/json/site/default.php index 7efd46939..ee4eda489 100644 --- a/views/json/site/default.php +++ b/views/json/site/default.php @@ -6,4 +6,4 @@ * @subpackage Core */ -elgg_view('export/entity', $vars);
\ No newline at end of file +echo elgg_view('export/entity', $vars); diff --git a/views/json/user/default.php b/views/json/user/default.php index e23472252..4d44692c9 100644 --- a/views/json/user/default.php +++ b/views/json/user/default.php @@ -6,4 +6,4 @@ * @subpackage Core */ -elgg_view('export/entity', $vars);
\ No newline at end of file +echo elgg_view('export/entity', $vars); |