diff options
| author | Sem <sembrestels@riseup.net> | 2013-03-13 02:13:17 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-03-13 02:13:17 +0100 |
| commit | d730a0c5861c2e79faa3e58dd2b171ca4d197c6f (patch) | |
| tree | cb4658e1c60a60c5f663845d49b108dd4608a89a /mod/file/pages | |
| parent | 0fb3e5396d10d21323eb3bbc04727fd4a5a6d06d (diff) | |
| parent | 34b14b305f5a106316fdc403c4ce80b25e89b51d (diff) | |
| download | elgg-d730a0c5861c2e79faa3e58dd2b171ca4d197c6f.tar.gz elgg-d730a0c5861c2e79faa3e58dd2b171ca4d197c6f.tar.bz2 | |
Merge tag '1.8.14' of git://github.com/Elgg/Elgg into foxglove-3
Elgg 1.8.14
Conflicts:
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
Diffstat (limited to 'mod/file/pages')
| -rw-r--r-- | mod/file/pages/file/owner.php | 4 | ||||
| -rw-r--r-- | mod/file/pages/file/search.php | 4 | ||||
| -rw-r--r-- | mod/file/pages/file/world.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php index fb87af1b2..d7f057f2a 100644 --- a/mod/file/pages/file/owner.php +++ b/mod/file/pages/file/owner.php @@ -36,8 +36,8 @@ $title = elgg_echo("file:user", array($owner->name)); // List files $content = elgg_list_entities(array( - 'types' => 'object', - 'subtypes' => 'file', + 'type' => 'object', + 'subtype' => 'file', 'container_guid' => $owner->guid, 'limit' => 10, 'full_view' => FALSE, diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php index 402a28933..d60dfb755 100644 --- a/mod/file/pages/file/search.php +++ b/mod/file/pages/file/search.php @@ -74,8 +74,8 @@ if ($listtype == "gallery") { } $params = array( - 'types' => 'object', - 'subtypes' => 'file', + 'type' => 'object', + 'subtype' => 'file', 'container_guid' => $page_owner_guid, 'limit' => $limit, 'full_view' => false, diff --git a/mod/file/pages/file/world.php b/mod/file/pages/file/world.php index 770dfd6e8..8e6c87f26 100644 --- a/mod/file/pages/file/world.php +++ b/mod/file/pages/file/world.php @@ -14,8 +14,8 @@ $limit = get_input("limit", 10); $title = elgg_echo('file:all'); $content = elgg_list_entities(array( - 'types' => 'object', - 'subtypes' => 'file', + 'type' => 'object', + 'subtype' => 'file', 'limit' => $limit, 'full_view' => FALSE )); |