diff options
| author | Sem <sembrestels@riseup.net> | 2012-04-25 19:09:22 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-04-25 19:09:22 +0200 |
| commit | 9fe063022e08a4b6fa5f5935f8f185d5d95814a4 (patch) | |
| tree | 87377f7b889efc639935508556beb9baf010e821 /mod/thewire/start.php | |
| parent | 24690ed95198c093e6fbb91a94b5d0544c740f89 (diff) | |
| download | elgg-9fe063022e08a4b6fa5f5935f8f185d5d95814a4.tar.gz elgg-9fe063022e08a4b6fa5f5935f8f185d5d95814a4.tar.bz2 | |
Upgraded to Elgg 1.8.4.
Diffstat (limited to 'mod/thewire/start.php')
| -rw-r--r-- | mod/thewire/start.php | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/mod/thewire/start.php b/mod/thewire/start.php index 202e3d1d6..5d5786e2f 100644 --- a/mod/thewire/start.php +++ b/mod/thewire/start.php @@ -18,12 +18,6 @@ elgg_register_event_handler('init', 'system', 'thewire_init'); * The Wire initialization */ function thewire_init() { - global $CONFIG; - - // this can be removed in favor of activate/deactivate scripts - if (!update_subtype('object', 'thewire', 'ElggWire')) { - add_subtype('object', 'thewire', 'ElggWire'); - } // register the wire's JavaScript $thewire_js = elgg_get_simplecache_url('js', 'thewire'); @@ -68,7 +62,7 @@ function thewire_init() { elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'thewire_notify_message'); // Register actions - $action_base = $CONFIG->pluginspath . 'thewire/actions'; + $action_base = elgg_get_plugins_path() . 'thewire/actions'; elgg_register_action("thewire/add", "$action_base/add.php"); elgg_register_action("thewire/delete", "$action_base/delete.php"); @@ -219,7 +213,7 @@ function thewire_filter($text) { // usernames $text = preg_replace( - '/(^|[^\w])@([\w.]+)/', + '/(^|[^\w])@([\p{L}\p{Nd}._]+)/u', '$1<a href="' . $CONFIG->wwwroot . 'thewire/owner/$2">@$2</a>', $text); @@ -310,7 +304,7 @@ function thewire_save_post($text, $userid, $access_id, $parent_guid = 0, $method */ function thewire_send_response_notification($guid, $parent_guid, $user) { $parent_owner = get_entity($parent_guid)->getOwnerEntity(); - $user = get_loggedin_user(); + $user = elgg_get_logged_in_user_entity(); // check to make sure user is not responding to self if ($parent_owner->guid != $user->guid) { |