diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/entities.php | 26 | ||||
| -rw-r--r-- | engine/lib/users.php | 4 |
2 files changed, 27 insertions, 3 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php index 3fbd6587c..2cbdc2e73 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -900,11 +900,35 @@ return trigger_plugin_hook('permissions_check',$entity->type,array('entity' => $entity, 'user' => $user),false);
}
+
+ /**
+ * Page handler for generic entities view system
+ *
+ * @param array $page Page elements from pain page handler
+ */
+ function entities_page_handler($page) {
+ if (isset($page[0])) {
+ global $CONFIG;
+ set_input('guid',$page[0]);
+ @include($CONFIG->path . "entities/index.php");
+ }
+ }
+
+ /**
+ * Entities init function; establishes the page handler
+ *
+ */
+ function entities_init() {
+ register_page_handler('view','entities_page_handler');
+ }
/** Register the import hook */ register_plugin_hook("import", "all", "import_entity_plugin_hook", 0); /** Register the hook, ensuring entities are serialised first */ - register_plugin_hook("export", "all", "export_entity_plugin_hook", 0); + register_plugin_hook("export", "all", "export_entity_plugin_hook", 0);
+
+ /** Register init system event **/
+ register_event_handler('init','system','entities_init'); ?>
\ No newline at end of file diff --git a/engine/lib/users.php b/engine/lib/users.php index 166225b9e..5669da06d 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -491,10 +491,10 @@ if (!empty($guid)) // Fixes "Exception thrown without stack frame" when db_select fails
$result = get_entity($guid);
- if (($result) && (!($result instanceof ElggUser)))
+ if ((!empty($result)) && (!($result instanceof ElggUser)))
throw new InvalidParameterException("GUID:$guid is not an ElggUser");
- if ($result)
+ if (!empty($result))
return $result;
return false;
|