diff options
| author | Mario <mario@mariovavti.com> | 2021-06-02 08:33:55 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-06-02 08:33:55 +0000 |
| commit | 657af3024e2db87153d71692e7bec77af41d3dcc (patch) | |
| tree | 2b95d4ab83b8827d8a3f99ef862ae0fd660ee591 | |
| parent | a0b788e96a0300540069e8e187f65362db8f6d67 (diff) | |
| parent | 7d82a34538936a219a0d1977fbadbe2cf72ed74a (diff) | |
| download | volse-hubzilla-657af3024e2db87153d71692e7bec77af41d3dcc.tar.gz volse-hubzilla-657af3024e2db87153d71692e7bec77af41d3dcc.tar.bz2 volse-hubzilla-657af3024e2db87153d71692e7bec77af41d3dcc.zip | |
Merge branch 'dev' into 'dev'
Make pubstream ordering configurable
See merge request hubzilla/core!1964
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 2 | ||||
| -rw-r--r-- | doc/hidden_configs.bb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 113f0a196..9c63c735d 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -197,7 +197,7 @@ class Pubstream extends \Zotlabs\Web\Controller { if($update) { - $ordering = "commented"; + $ordering = get_config('system', 'pubstream_ordering', 'commented'); if($load) { if($mid) { diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb index 27ea415bd..4eac1aa6e 100644 --- a/doc/hidden_configs.bb +++ b/doc/hidden_configs.bb @@ -87,6 +87,7 @@ Options are: [*= system.proc_run_use_exec ] If 1, use the exec system call in proc_run to run background tasks. By default we use proc_open and proc_close. On some (currently rare) systems this does not work well. [*= system.projecthome ] Display the project page on your home page for logged out viewers. [*= system.projecthome ] Set the project homepage as the homepage of your hub. (Obsolete) + [*= system.pubstream_ordering ] Set pubstream ordering. Possible values 'commented' (default), 'created' and 'edited'. [*= system.register_link ] path to direct to from the "register" link on the login form. On closed sites this will direct to 'pubsites'. For open sites it will normally redirect to 'register' but you may change this to a custom site page offering subscriptions or whatever. [*= system.reserved_channels ] Don't allow members to register channels with this comma separated list of names (no spaces) [*= system.sellpage ] A URL shown in the public sites list to sell your hub - display service classes, etc. |