Merge branch 'develop' into new_image_presentation

[friendica.git] / src / Core / System.php

diff --git a/src/Core/System.php b/src/Core/System.php
index 0c08fe16818431c50b23f5f89278694f735ea6ae..707649a49d3406cf2f64ee7f943925bd57992cff 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -440,11 +440,12 @@ class System
        /**
         * Fetch the load and number of processes
         *
+        * @param bool $get_processes
         * @return array
         */
-       public static function getLoadAvg(): array
+       public static function getLoadAvg(bool $get_processes = true): array
        {
-               if (@is_readable('/proc/loadavg')) {
+               if ($get_processes && @is_readable('/proc/loadavg')) {
                        $content = @file_get_contents('/proc/loadavg');
                        if (empty($content)) {
                                $content = shell_exec('uptime | sed "s/.*averages*: //" | sed "s/,//g"');
@@ -664,7 +665,6 @@ class System
 
        /**
         * Fetch the system rules
-        * @todo We should have got a better way to store and fetch the rules
         *
         * @return array
         */
@@ -674,7 +674,8 @@ class System
                $id    = 0;
 
                if (DI::config()->get('system', 'tosdisplay')) {
-                       $html = BBCode::convert(DI::config()->get('system', 'tostext'), false, BBCode::EXTERNAL);
+                       $rulelist = DI::config()->get('system', 'tosrules') ?: DI::config()->get('system', 'tostext');
+                       $html = BBCode::convert($rulelist, false, BBCode::EXTERNAL);
 
                        $msg = HTML::toPlaintext($html, 0, true);
                        foreach (explode("\n", $msg) as $line) {