aboutsummaryrefslogtreecommitdiff
path: root/views/php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2011-11-18 07:32:27 +0100
committerSem <sembrestels@riseup.net>2011-11-18 07:32:27 +0100
commite53d410129701ea1c9d19529afa493f11b5f5b70 (patch)
treed9963b24bf8932654b4a47e36602c75975e50dba /views/php
parent377da25d2965c64941f83baae119fc970ec60982 (diff)
parent08a962c98e2923724f8013d6eaae89101243752a (diff)
downloadelgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz
elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2
Merge github.com:Elgg/Elgg
Conflicts: engine/lib/input.php
Diffstat (limited to 'views/php')
-rw-r--r--views/php/api/output.php3
-rw-r--r--views/php/group/default.php2
-rw-r--r--views/php/object/default.php2
-rw-r--r--views/php/page/default.php3
-rw-r--r--views/php/search/entity_list.php14
-rw-r--r--views/php/site/default.php8
-rw-r--r--views/php/user/default.php2
7 files changed, 7 insertions, 27 deletions
diff --git a/views/php/api/output.php b/views/php/api/output.php
index cc76b97e0..14259564c 100644
--- a/views/php/api/output.php
+++ b/views/php/api/output.php
@@ -1,11 +1,10 @@
<?php
/**
* Elgg PHP output
- * This outputs the api as PHP
+ * This outputs the api results as serialized PHP
*
* @package Elgg
* @subpackage Core
- *
*/
$result = $vars['result'];
diff --git a/views/php/group/default.php b/views/php/group/default.php
index eed1dbfbd..968d68bcd 100644
--- a/views/php/group/default.php
+++ b/views/php/group/default.php
@@ -1,6 +1,6 @@
<?php
/**
- * Elgg default layout
+ * PHP group view
*
* @package Elgg
* @subpackage Core
diff --git a/views/php/object/default.php b/views/php/object/default.php
index eed1dbfbd..8cf4eb8c6 100644
--- a/views/php/object/default.php
+++ b/views/php/object/default.php
@@ -1,6 +1,6 @@
<?php
/**
- * Elgg default layout
+ * PHP object view
*
* @package Elgg
* @subpackage Core
diff --git a/views/php/page/default.php b/views/php/page/default.php
index c7692c432..87211a462 100644
--- a/views/php/page/default.php
+++ b/views/php/page/default.php
@@ -1,10 +1,9 @@
<?php
/**
- * Elgg PHP output pageshell
+ * PHP output pageshell
*
* @package Elgg
* @subpackage Core
- *
*/
echo $vars['body']; \ No newline at end of file
diff --git a/views/php/search/entity_list.php b/views/php/search/entity_list.php
deleted file mode 100644
index c56874bdb..000000000
--- a/views/php/search/entity_list.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$entities = $vars['entities'];
-if (is_array($entities) && sizeof($entities) > 0) {
- foreach($entities as $entity) {
- echo elgg_view_entity($entity);
- }
-} \ No newline at end of file
diff --git a/views/php/site/default.php b/views/php/site/default.php
index 4b8d12e6d..102ac7ec7 100644
--- a/views/php/site/default.php
+++ b/views/php/site/default.php
@@ -1,13 +1,9 @@
<?php
/**
- * Elgg default layout
+ * PHP site view
*
* @package Elgg
* @subpackage Core
*/
-for ($i = 1; $i < 8; $i++) {
- if (isset($vars["area{$i}"])) {
- echo $vars["area{$i}"];
- }
-} \ No newline at end of file
+elgg_view('export/entity', $vars); \ No newline at end of file
diff --git a/views/php/user/default.php b/views/php/user/default.php
index eed1dbfbd..1bb0f8fa9 100644
--- a/views/php/user/default.php
+++ b/views/php/user/default.php
@@ -1,6 +1,6 @@
<?php
/**
- * Elgg default layout
+ * PHP user view
*
* @package Elgg
* @subpackage Core