Revision: 46311
Author: werdna
Date: 2009-01-27 02:02:12 +0000 (Tue, 27 Jan 2009)
Log Message:
-----------
Remove something non-mysql compat for now. We'll re-add it properly tomorrow.
Modified Paths:
--------------
trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php 2009-01-27
01:51:13 UTC (rev 46310)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php 2009-01-27
02:02:12 UTC (rev 46311)
@@ -127,7 +127,7 @@
#$this->mConds[] = 'afa_filter=af_id';
$abuse_filter = $dbr->tableName( 'abuse_filter' );
return array( 'tables' => array('abuse_filter',
'abuse_filter_action'),
- 'fields' => array( 'af_id', '(af_enabled | af_deleted
<< 1) AS status', 'af_public_comments', 'af_hidden', 'af_hit_count',
'af_timestamp', 'af_user_text', 'af_user', 'group_concat(afa_consequence) AS
consequences' ),
+ 'fields' => array( 'af_id', '(af_enabled | af_deleted
<< 1) AS status', 'af_public_comments', 'af_hidden', 'af_hit_count',
'af_timestamp', 'af_user_text', 'af_user', /*'group_concat(afa_consequence) AS
consequences'*/ ),
'conds' => $this->mConds,
'options' => array( 'GROUP BY' => 'af_id' ),
'join_conds' => array( 'abuse_filter_action' => array(
'LEFT JOIN', 'afa_filter=af_id' ) ) );
@@ -144,7 +144,7 @@
return $headers;
}
- $headers = array( 'af_id' => 'abusefilter-list-id',
'af_public_comments' => 'abusefilter-list-public', 'consequences' =>
'abusefilter-list-consequences', 'status' => 'abusefilter-list-status',
'af_timestamp' => 'abusefilter-list-lastmodified', 'af_hidden' =>
'abusefilter-list-visibility', 'af_hit_count' => 'abusefilter-list-hitcount' );
+ $headers = array( 'af_id' => 'abusefilter-list-id',
'af_public_comments' => 'abusefilter-list-public', /*'consequences' =>
'abusefilter-list-consequences',*/ 'status' => 'abusefilter-list-status',
'af_timestamp' => 'abusefilter-list-lastmodified', 'af_hidden' =>
'abusefilter-list-visibility', 'af_hit_count' => 'abusefilter-list-hitcount' );
$headers = array_map( 'wfMsg', $headers );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
