diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-11 21:19:14 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-11 21:19:14 +0200 |
| commit | b83574ae1b8ada2bb9c2247492806473df920259 (patch) | |
| tree | 30f9010da3cab12bda4921f079cfe86fcef2e7a4 /views/json/export/entity.php | |
| parent | 46bd104bd523c08ff2f6bc0342be9ae1251259e8 (diff) | |
| parent | 4d42fd0263948eee4a7c7a26ceca0647c01cce32 (diff) | |
| download | elgg-b83574ae1b8ada2bb9c2247492806473df920259.tar.gz elgg-b83574ae1b8ada2bb9c2247492806473df920259.tar.bz2 | |
Merge tag '1.8.8' of git://github.com/Elgg/Elgg into lorea-preprod
Elgg 1.8.8 release
Conflicts:
js/lib/languages.js
Diffstat (limited to 'views/json/export/entity.php')
| -rw-r--r-- | views/json/export/entity.php | 5 |
1 files changed, 4 insertions, 1 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"; |