Commit 8fb705c4 authored by Robert Lyon's avatar Robert Lyon Committed by Cecilia Vela Gurovic
Browse files

Bug 1879847: Removing non-content from Content report 



As we were including data flags with accumulative statistics

Also updated the modal label about the columns

Change-Id: Iec2427c67273e6e51016934010118e1e25e80724
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit bc29aaa3)
(cherry picked from commit 414352c6)
parent c9bb309c

htdocs/lang/en.utf8/statistics.php

+3 −5
Original line number Diff line number Diff line
@@ -357,11 +357,9 @@ $string['reportdescgroups'] = '<ul> 


// Content reports

$string['reportdesccontent'] = '<ul>

<li>Title</li>

<li>Number of modifications</li>

<li>Total</li>

<li>Number of unique users who made the modifications</li>

<li>Number of unique users over the total</li>

<li>Name</li>

<li>Total modified during time period</li>

<li>Total existing at end of time period</li>

</ul>';

$string['reportdescobjectionable'] = "<ul>

<li>Page title</li>

htdocs/lib/statistics.php

+2 −1
Original line number Diff line number Diff line
@@ -3081,7 +3081,8 @@ function content_stats_table($limit, $offset, $extra) { 
        $fromsql .= " WHERE sr.id IN (SELECT id FROM {site_registration} ORDER BY time DESC LIMIT 2)";

    }

    $fromsql .= " AND sd.value " . (is_postgres() ? '~ E' : 'REGEXP ') . "'^[0-9]+$'

                  AND sd.field NOT LIKE '%version'";

                  AND sd.field NOT LIKE '%version'

                  AND sd.field NOT IN ('allowpublicviews', 'allowpublicprofiles', 'newstats')";

    $regdata = get_records_sql_array("SELECT DISTINCT sr.id, sr.time " . $fromsql . " ORDER BY sr.time DESC", $values);



    $count = ($regdata) ? count_records_sql("SELECT COUNT(*) " . $fromsql . " AND sr.id = " . $regdata[0]->id, $values) : 0;