diff options
| author | Sem <sembrestels@riseup.net> | 2012-01-12 16:15:16 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-01-12 16:15:16 +0100 |
| commit | cc544cfa2086e418318a899ffd550adfb744c7ba (patch) | |
| tree | 6c04fbe2e3df67513aa76803cb8d05c105ba219b /mod/thewire | |
| parent | e7d64510ebd823f186282e2b80780295bcca1b79 (diff) | |
| parent | 68e4829ac0959d86c651e7ed6dc255c39694c8af (diff) | |
| download | elgg-cc544cfa2086e418318a899ffd550adfb744c7ba.tar.gz elgg-cc544cfa2086e418318a899ffd550adfb744c7ba.tar.bz2 | |
Merge Elgg 1.8.3.
Diffstat (limited to 'mod/thewire')
| -rw-r--r-- | mod/thewire/classes/ElggWire.php | 4 | ||||
| -rw-r--r-- | mod/thewire/start.php | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mod/thewire/classes/ElggWire.php b/mod/thewire/classes/ElggWire.php index 3242dd5cb..9c92dd8f2 100644 --- a/mod/thewire/classes/ElggWire.php +++ b/mod/thewire/classes/ElggWire.php @@ -1,6 +1,10 @@ <?php /** * ElggWire Class + * + * @property string $method The method used to create the wire post (site, sms, api) + * @property bool $reply Whether this wire post was a reply to another post + * @property int $wire_thread The identifier of the thread for this wire post */ class ElggWire extends ElggObject { diff --git a/mod/thewire/start.php b/mod/thewire/start.php index 328e5d46c..202e3d1d6 100644 --- a/mod/thewire/start.php +++ b/mod/thewire/start.php @@ -30,6 +30,8 @@ function thewire_init() { elgg_register_simplecache_view('js/thewire'); elgg_register_js('elgg.thewire', $thewire_js, 'footer'); + elgg_register_ajax_view('thewire/previous'); + // add a site navigation item $item = new ElggMenuItem('thewire', elgg_echo('thewire'), 'thewire/all'); elgg_register_menu_item('site', $item); |