http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65320
Revision: 65320
Author: reedy
Date: 2010-04-20 14:19:51 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
querypage-work2: Merge r50105
Modified Paths:
--------------
branches/querypage-work2/TODO
branches/querypage-work2/phase3/includes/QueryPage.php
branches/querypage-work2/phase3/includes/specials/SpecialAncientpages.php
branches/querypage-work2/phase3/includes/specials/SpecialBrokenRedirects.php
branches/querypage-work2/phase3/includes/specials/SpecialDeadendpages.php
branches/querypage-work2/phase3/includes/specials/SpecialDisambiguations.php
branches/querypage-work2/phase3/includes/specials/SpecialDoubleRedirects.php
branches/querypage-work2/phase3/includes/specials/SpecialFewestrevisions.php
branches/querypage-work2/phase3/includes/specials/SpecialListredirects.php
branches/querypage-work2/phase3/includes/specials/SpecialLonelypages.php
branches/querypage-work2/phase3/includes/specials/SpecialMostcategories.php
branches/querypage-work2/phase3/includes/specials/SpecialMostimages.php
branches/querypage-work2/phase3/includes/specials/SpecialMostlinked.php
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedcategories.php
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedtemplates.php
branches/querypage-work2/phase3/includes/specials/SpecialShortpages.php
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedpages.php
branches/querypage-work2/phase3/includes/specials/SpecialUnusedcategories.php
branches/querypage-work2/phase3/includes/specials/SpecialUnusedimages.php
branches/querypage-work2/phase3/includes/specials/SpecialUnusedtemplates.php
branches/querypage-work2/phase3/includes/specials/SpecialUnwatchedpages.php
branches/querypage-work2/phase3/includes/specials/SpecialWantedcategories.php
branches/querypage-work2/phase3/includes/specials/SpecialWantedfiles.php
branches/querypage-work2/phase3/includes/specials/SpecialWantedpages.php
branches/querypage-work2/phase3/includes/specials/SpecialWantedtemplates.php
branches/querypage-work2/phase3/includes/specials/SpecialWithoutinterwiki.php
Property Changed:
----------------
branches/querypage-work2/
branches/querypage-work2/phase3/
branches/querypage-work2/phase3/includes/
branches/querypage-work2/phase3/includes/ChangesList.php
branches/querypage-work2/phase3/includes/ConfEditor.php
branches/querypage-work2/phase3/includes/OutputPage.php
branches/querypage-work2/phase3/includes/api/
branches/querypage-work2/phase3/includes/specials/
branches/querypage-work2/phase3/maintenance/cleanupTable.inc
branches/querypage-work2/phase3/skins/common/jquery.js
branches/querypage-work2/phase3/skins/common/jquery.min.js
Property changes on: branches/querypage-work2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/querypage-work:49084,49599,49631,49951
+ /branches/querypage-work:49084,49599,49631,49951,50105
Modified: branches/querypage-work2/TODO
===================================================================
--- branches/querypage-work2/TODO 2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/TODO 2010-04-20 14:19:51 UTC (rev 65320)
@@ -5,8 +5,8 @@
** Check whether sorts are efficient and page right
** Check whether sorting by nothing is really what we want
** Check whether selecting title or ns AS value is really what we want
-* Replace $result->type with getName(), remove type from queries
* Mark ShortPages as inexpensive
* Reuse UncategorizedPages code in UncategorizedImages somehow
* Make UncategorizedPages parameterized by namespace
+* Convert UncategorizedImages
Property changes on: branches/querypage-work2/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/querypage-work/phase3:49084,49599,49631,49951
/branches/sqlite:58211-58321
+ /branches/REL1_15/phase3:51646
/branches/querypage-work/phase3:49084,49599,49631,49951,50105
/branches/sqlite:58211-58321
Property changes on: branches/querypage-work2/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/querypage-work/phase3/includes:49084,49599,49631,49951
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
+ /branches/REL1_15/phase3/includes:51646
/branches/querypage-work/phase3/includes:49084,49599,49631,49951,50105
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
Property changes on: branches/querypage-work2/phase3/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/querypage-work/phase3/includes/ChangesList.php:49084,49599,49631,49951
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
+ /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/querypage-work/phase3/includes/ChangesList.php:49084,49599,49631,49951,50105
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
Property changes on: branches/querypage-work2/phase3/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/querypage-work/phase3/includes/ConfEditor.php:49084,49599,49631,49951
+
/branches/querypage-work/phase3/includes/ConfEditor.php:49084,49599,49631,49951,50105
Property changes on: branches/querypage-work2/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/querypage-work/phase3/includes/OutputPage.php:49084,49599,49631,49951
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/querypage-work/phase3/includes/OutputPage.php:49084,49599,49631,49951,50105
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
Modified: branches/querypage-work2/phase3/includes/QueryPage.php
===================================================================
--- branches/querypage-work2/phase3/includes/QueryPage.php 2010-04-20
14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/QueryPage.php 2010-04-20
14:19:51 UTC (rev 65320)
@@ -114,8 +114,8 @@
* options => options
* join_conds => JOIN conditions
*
- * Note that the query itself should return the following four columns:
- * 'type' (your special page's name), 'namespace', 'title', and 'value'
+ * Note that the query itself should return the following three columns:
+ * 'namespace', 'title', and 'value'
* *in that order*. 'value' is used for sorting.
*
* These may be stored in the querycache table for expensive queries,
@@ -279,7 +279,7 @@
$value = 0;
}
- $vals[] = array('qc_type' => $row->type,
+ $vals[] = array('qc_type' => $this->getName(),
'qc_namespace' =>
$row->namespace,
'qc_title' => $row->title,
'qc_value' => $value);
@@ -400,7 +400,7 @@
if( !$this->listoutput ) {
# Fetch the timestamp of this update
- $tRes = $dbr->select( 'querycache_info', array(
'qci_timestamp' ), array( 'qci_type' => $type ), $fname );
+ $tRes = $dbr->select( 'querycache_info', array(
'qci_timestamp' ), array( 'qci_type' => $sname ), $fname );
$tRow = $dbr->fetchObject( $tRes );
if( $tRow ) {
Property changes on: branches/querypage-work2/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636
/branches/querypage-work/phase3/includes/api:49084,49599,49631,49951
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952
+ /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636
/branches/querypage-work/phase3/includes/api:49084,49599,49631,49951,50105
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952
Property changes on: branches/querypage-work2/phase3/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials:51646
/branches/querypage-work/phase3/includes/specials:49084,49599,49631,49951
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
+ /branches/REL1_15/phase3/includes/specials:51646
/branches/querypage-work/phase3/includes/specials:49084,49599,49631,49951,50105
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialAncientpages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialAncientpages.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialAncientpages.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -21,11 +21,9 @@
function isSyndicated() { return false; }
function getQueryInfo() {
- // FIXME standardize 'name' AS type ?
return array(
'tables' => array( 'page', 'revision' ),
- 'fields' => array( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array( 'page_namespace AS namespace',
'page_title AS title',
'rev_timestamp AS value' ),
'conds' => array( 'page_namespace' =>
MWNamespace::getContentNamespaces(),
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialBrokenRedirects.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialBrokenRedirects.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialBrokenRedirects.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -26,8 +26,7 @@
function getQueryInfo() {
return array(
'tables' => array( 'redirect', 'page AS p1', 'page AS
p2' ),
- 'fields' => array( "'{$this->getName()}' AS type",
- 'p1.page_namespace AS namespace',
+ 'fields' => array( 'p1.page_namespace AS namespace',
'p1.page_title AS title',
'rd_namespace',
'rd_title'
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialDeadendpages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialDeadendpages.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialDeadendpages.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -38,8 +38,7 @@
function getQueryInfo() {
return array(
'tables' => array( 'page', 'pagelinks' ),
- 'fields' => array( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array( 'page_namespace AS namespace',
'page_title AS title',
'page_title AS value'
),
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialDisambiguations.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialDisambiguations.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialDisambiguations.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -128,8 +128,7 @@
// FIXME: What are pagelinks and p2 doing here?
return array (
'tables' => array( 'templatelinks', 'page AS p1',
'pagelinks', 'page AS p2' ),
- 'fields' => array( "'{$this->getName()}' AS type",
- 'p1.page_namespace AS namespace',
+ 'fields' => array( 'p1.page_namespace AS namespace',
'p1.page_title AS title',
'pl_from AS value' ),
'conds' => array( $set,
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialDoubleRedirects.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialDoubleRedirects.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialDoubleRedirects.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -28,8 +28,7 @@
'tables' => array ( 'redirect AS ra', 'redirect AS rb',
'page AS pa', 'page AS pb',
'page AS pc' ),
- 'fields' => array ( '"{$this->getName()}" AS type',
- 'pa.page_namespace AS namespace',
+ 'fields' => array ( 'pa.page_namespace AS namespace',
'pa.page_title AS title',
'pb.page_namespace AS nsb',
'pb.page_title AS tb',
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialFewestrevisions.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialFewestrevisions.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialFewestrevisions.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -27,8 +27,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'revision', 'page' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title',
'COUNT(*) AS value',
'page_is_redirect AS redirect' ),
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialListredirects.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialListredirects.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialListredirects.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -22,8 +22,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'page' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title' ),
'conds' => array ( 'page_is_redirect' => 1 )
);
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialLonelypages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialLonelypages.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialLonelypages.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -31,8 +31,7 @@
return array (
'tables' => array ( 'page', 'pagelinks',
'templatelinks' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title',
'page_title AS value' ),
'conds' => array ( 'pl_namespace IS NULL',
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialMostcategories.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialMostcategories.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialMostcategories.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -21,8 +21,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'categorylinks', 'page' ),
- 'fields' => array ( "'{$this->getName()}' AS name",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title',
'COUNT(*) AS value' ),
'conds' => array ( 'page_namespace' =>
MWNamespace::getContentNamespaces() ),
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialMostimages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialMostimages.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialMostimages.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -21,8 +21,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'imagelinks' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- "'" . NS_FILE . "' AS namespace",
+ 'fields' => array ( "'" . NS_FILE . "' AS namespace",
'il_to AS title',
'COUNT(*) AS value' ),
'options' => array ( 'GROUP BY' => 'il_to',
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialMostlinked.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialMostlinked.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialMostlinked.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -25,8 +25,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'pagelinks', 'page' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'pl_namespace AS namespace',
+ 'fields' => array ( 'pl_namespace AS namespace',
'pl_title AS title',
'COUNT(*) AS value',
'page_namespace' ),
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedcategories.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedcategories.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedcategories.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -22,8 +22,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'categorylinks' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- "'" . NS_CATEGORY . "' AS namespace",
+ 'fields' => array ( "'" . NS_CATEGORY . "' AS
namespace",
'cl_to AS title',
'COUNT(*) AS value' ),
'options' => array ( 'GROUP BY' => 'cl_to' )
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedtemplates.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedtemplates.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedtemplates.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -52,8 +52,7 @@
public function getQueryInfo() {
return array (
'tables' => array ( 'templatelinks' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'tl_namespace AS namespace',
+ 'fields' => array ( 'tl_namespace AS namespace',
'tl_title AS title',
'COUNT(*) AS value' ),
'conds' => array ( 'tl_namespace' => NS_TEMPLATE' ),
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialShortpages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialShortpages.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialShortpages.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -30,8 +30,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'page' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title',
'page_len AS value' ),
'conds' => array ( 'page_namespace' =>
MWNamespace::getContentNamespaces(),
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedpages.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedpages.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedpages.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -28,8 +28,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'page', 'categorylinks' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title',
'page_title AS value' ),
// default for page_namespace is all content namespaces
(if requestedNamespace is false)
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialUnusedcategories.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialUnusedcategories.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialUnusedcategories.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -22,8 +22,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'page', 'categorylinks' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title',
'page_title AS value' ),
'conds' => array ( 'cl_from IS NULL',
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialUnusedimages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialUnusedimages.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialUnusedimages.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -25,8 +25,7 @@
global $wgCountCategorizedImagesAsUsed;
$retval = array (
'tables' => array ( 'image', 'imagelinks' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- "'" . NS_FILE . "' AS namespace",
+ 'fields' => array ( "'" . NS_FILE . "' AS namespace",
'img_name AS title',
'img_timestamp AS value',
'img_user', 'img_user_text',
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialUnusedtemplates.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialUnusedtemplates.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialUnusedtemplates.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -21,8 +21,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'page', 'templatelinks' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title',
'0 AS value' ),
'conds' => array ( 'page_namespace' => NS_TEMPLATE,
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialUnwatchedpages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialUnwatchedpages.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialUnwatchedpages.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -22,8 +22,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'page', 'watchlist' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title',
'page_namespace AS value' ),
'conds' => array ( 'wl_title IS NULL',
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialWantedcategories.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialWantedcategories.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialWantedcategories.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -22,8 +22,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'categorylinks', 'page' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- "'" . NS_CATEGORY . "' AS namespace",
+ 'fields' => array ( "'" . NS_CATEGORY . "' AS
namespace",
'cl_to AS title',
'COUNT(*) AS value' ),
'conds' => array ( 'page_title IS NULL' ),
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialWantedfiles.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialWantedfiles.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialWantedfiles.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -22,8 +22,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'imagelinks', 'page' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- "'" . NS_FILE . "' AS namespace",
+ 'fields' => array ( "'" . NS_FILE . "' AS namespace",
'il_to AS title',
'COUNT(*) AS value' ),
'conds' => array ( 'page_title IS NULL' ),
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialWantedpages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialWantedpages.php
2010-04-20 14:19:12 UTC (rev 65319)
+++ branches/querypage-work2/phase3/includes/specials/SpecialWantedpages.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -51,8 +51,7 @@
$query = array (
'tables' => array ( 'pagelinks', 'page AS pg1',
'page AS pg2' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'pl_namespace AS namespace',
+ 'fields' => array ( 'pl_namespace AS namespace',
'pl_title AS title',
'COUNT(*) AS value' ),
'conds' => array ( 'pg1.page_namespace IS NULL',
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialWantedtemplates.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialWantedtemplates.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialWantedtemplates.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -23,8 +23,7 @@
function getQueryInfo() {
return array (
'tables' => array ( 'templatelinks', 'page' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'tl_namespace AS namespace',
+ 'fields' => array ( 'tl_namespace AS namespace',
'tl_title AS title',
'COUNT(*) AS value' ),
'conds' => array ( 'page_title IS NULL',
Modified:
branches/querypage-work2/phase3/includes/specials/SpecialWithoutinterwiki.php
===================================================================
---
branches/querypage-work2/phase3/includes/specials/SpecialWithoutinterwiki.php
2010-04-20 14:19:12 UTC (rev 65319)
+++
branches/querypage-work2/phase3/includes/specials/SpecialWithoutinterwiki.php
2010-04-20 14:19:51 UTC (rev 65320)
@@ -53,8 +53,7 @@
function getQueryInfo() {
$query = array (
'tables' => array ( 'page', 'langlinks' ),
- 'fields' => array ( "'{$this->getName()}' AS type",
- 'page_namespace AS namespace',
+ 'fields' => array ( 'page_namespace AS namespace',
'page_title AS title',
'page_title AS value' ),
'conds' => array ( 'll_title IS NULL' ),
Property changes on:
branches/querypage-work2/phase3/maintenance/cleanupTable.inc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/querypage-work/phase3/maintenance/cleanupTable.inc:49084,49599,49631,49951
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
+ /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/querypage-work/phase3/maintenance/cleanupTable.inc:49084,49599,49631,49951,50105
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
Property changes on: branches/querypage-work2/phase3/skins/common/jquery.js
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/querypage-work/phase3/skins/common/jquery.js:49084,49599,49631,49951
+
/branches/querypage-work/phase3/skins/common/jquery.js:49084,49599,49631,49951,50105
Property changes on: branches/querypage-work2/phase3/skins/common/jquery.min.js
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49599,49631,49951
+
/branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49599,49631,49951,50105
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
