https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114394
Revision: 114394 Author: catrope Date: 2012-03-21 19:25:49 +0000 (Wed, 21 Mar 2012) Log Message: ----------- Revert r113364, r113598, r113604, r113793, r113795. Unreviewed changes in Nuke. All of these revisions are tagged with 'gerritmigration' and will be resubmitted into Gerrit after the Gerrit switchover. See also http://lists.wikimedia.org/pipermail/wikitech-l/2012-March/059124.html Modified Paths: -------------- trunk/extensions/Nuke/Nuke.i18n.php trunk/extensions/Nuke/Nuke.php trunk/extensions/Nuke/Nuke_body.php trunk/extensions/Nuke/RELEASE-NOTES Modified: trunk/extensions/Nuke/Nuke.i18n.php =================================================================== --- trunk/extensions/Nuke/Nuke.i18n.php 2012-03-21 19:21:18 UTC (rev 114393) +++ trunk/extensions/Nuke/Nuke.i18n.php 2012-03-21 19:25:49 UTC (rev 114394) @@ -37,6 +37,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Delete more pages]]', 'nuke-pattern' => 'Pattern for the page name:', 'nuke-nopages-global'=> 'There are no new pages in [[Special:RecentChanges|recent changes]].', + 'nuke-viewchanges' => 'view changes', ); /** Message documentation (Message documentation) @@ -195,6 +196,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Desaniciar más páxines]]', 'nuke-pattern' => 'Patrón pal nome de páxina:', 'nuke-nopages-global' => 'Nun hai páxines nueves nos [[Special:RecentChanges|cambios recientes]].', + 'nuke-viewchanges' => 'ver los cambios', ); /** Azerbaijani (Azərbaycanca) @@ -286,6 +288,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Масавае выдаленьне старонак]]', 'nuke-pattern' => 'Узор для назвы старонкі:', 'nuke-nopages-global' => 'У [[Special:RecentChanges|апошніх зьменах]] больш няма новых старонак.', + 'nuke-viewchanges' => 'праглядзець зьмены', ); /** Bulgarian (Български) @@ -353,6 +356,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Diverkañ pajennoù all]]', 'nuke-pattern' => 'Patrom evit anv ar bajenn :', 'nuke-nopages-global' => "N'eus pajenn nevez ebet er [[Special:RecentChanges|c'hemmoù diwezhañ]].", + 'nuke-viewchanges' => "Diskouez ar c'hemmoù", ); /** Bosnian (Bosanski) @@ -505,6 +509,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Weitere Seiten löschen]]', 'nuke-pattern' => 'Muster für den Seitennamen:', 'nuke-nopages-global' => 'Es gibt keine neuen Seiten unter den [[Special:RecentChanges|letzten Änderungen]].', + 'nuke-viewchanges' => 'Änderungen ansehen', ); /** German (formal address) (Deutsch (Sie-Form)) @@ -564,6 +569,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Dalšne boki lašowaś]]', 'nuke-pattern' => 'Pśikład za bokowe mě:', 'nuke-nopages-global' => 'Njejsu žedne nowe boki w [[Special:RecentChanges|aktualnych změnach]].', + 'nuke-viewchanges' => 'změny pokazaś', ); /** Ewe (Eʋegbe) */ @@ -662,6 +668,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Borrar más páginas]]', 'nuke-pattern' => 'Patrón del título de la página:', 'nuke-nopages-global' => 'No hay nuevas páginas en los [[Special:RecentChanges|cambios recientes]].', + 'nuke-viewchanges' => 'Mostrar cambios', ); /** Estonian (Eesti) @@ -734,6 +741,7 @@ 'nuke-delete-more' => '[[Special:Nuke|حذف صفحههای بیشتر]]', 'nuke-pattern' => 'الگو برای نام صفحه:', 'nuke-nopages-global' => 'هیچ صفحهٔ جدیدی در [[Special:RecentChanges|فهرست تغییرات اخیر]] نیست.', + 'nuke-viewchanges' => 'نمایش تغییرات', ); /** Finnish (Suomi) @@ -805,6 +813,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Supprimer plus de pages]]', 'nuke-pattern' => 'Modèle pour le nom de page:', 'nuke-nopages-global' => "Il n'y a pas de nouvelle page dans [[Special:RecentChanges|changements récents]].", + 'nuke-viewchanges' => 'voir les modifications', ); /** Franco-Provençal (Arpetan) @@ -874,6 +883,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Borrar máis páxinas]]', 'nuke-pattern' => 'Patrón para o nome de páxina:', 'nuke-nopages-global' => 'Non hai páxinas novas nos [[Special:RecentChanges|cambios recentes]].', + 'nuke-viewchanges' => 'ollar os cambios', ); /** Ancient Greek (Ἀρχαία ἑλληνικὴ) @@ -957,6 +967,7 @@ 'nuke-delete-more' => '[[Special:Nuke|למחוק עוד דפים]]', 'nuke-pattern' => 'תבנית עבור שם הדף:', 'nuke-nopages-global' => 'אין דפים חדשים ב[[Special:RecentChanges|שינויים אחרונים]].', + 'nuke-viewchanges' => 'הצגת שינויים', ); /** Hindi (हिन्दी) @@ -1032,6 +1043,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Dalše strony wušmórnyć]]', 'nuke-pattern' => 'Přikład za mjeno strony:', 'nuke-nopages-global' => 'Njejsu žane nowe strony w [[Special:RecentChanges|aktualnych změnach]].', + 'nuke-viewchanges' => 'změny pokazać', ); /** Hungarian (Magyar) @@ -1087,6 +1099,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Deler plus paginas]]', 'nuke-pattern' => 'Patrono pro le nomine de pagina:', 'nuke-nopages-global' => 'Il non ha nove paginas in le [[Special:RecentChanges|modificationes recente]].', + 'nuke-viewchanges' => 'vider modificationes', ); /** Indonesian (Bahasa Indonesia) @@ -1221,6 +1234,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Cancella più pagine]]', 'nuke-pattern' => 'Modello per il titolo della pagina:', 'nuke-nopages-global' => 'Non ci sono nuove pagine negli [[Special:RecentChanges|ultimi cambiamenti]].', + 'nuke-viewchanges' => 'vedi modifiche', ); /** Japanese (日本語) @@ -1443,6 +1457,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Méi Säite läschen]]', 'nuke-pattern' => 'Muster fir de Säitennumm:', 'nuke-nopages-global' => 'Et si keng nei Säiten an de [[Special:RecentChanges|rezenten Ännerungen]].', + 'nuke-viewchanges' => 'Ännerunge weisen', ); /** Limburgish (Limburgs) @@ -1535,6 +1550,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Избриши уште страници]]', 'nuke-pattern' => 'Мостра за име на страница:', 'nuke-nopages-global' => 'Нема нови страници во [[Special:RecentChanges|скорешните промени]].', + 'nuke-viewchanges' => 'прикажи промени', ); /** Malayalam (മലയാളം) @@ -1610,6 +1626,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Hapuskan lebih banyak laman]]', 'nuke-pattern' => 'Pola nama laman:', 'nuke-nopages-global' => 'Tiada laman baru dalam [[Special:RecentChanges|perubahan terkini]].', + 'nuke-viewchanges' => 'lihat perubahan', ); /** Maltese (Malti) @@ -1746,6 +1763,7 @@ 'nuke-delete-more' => "[[Special:Nuke|Meer pagina's verwijderen]]", 'nuke-pattern' => 'Patroon voor de paginanaam:', 'nuke-nopages-global' => "Er zijn geen nieuwe pagina's in de [[Special:RecentChanges|recente wijzigingen]].", + 'nuke-viewchanges' => 'wijzigingen bekijken', ); /** Norwegian Nynorsk (Norsk (nynorsk)) @@ -1868,6 +1886,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Usuń więcej stron]]', 'nuke-pattern' => 'Wzór nazwy strony:', 'nuke-nopages-global' => 'Brak nowych stron w [[Special:RecentChanges|ostatnich zmianach]].', + 'nuke-viewchanges' => 'widok zmian', ); /** Piedmontese (Piemontèis) @@ -1898,6 +1917,7 @@ 'nuke-delete-more' => "[[Special:Nuke|Scancelé pì 'd pàgine]]", 'nuke-pattern' => 'Model për ël nòm ëd pàgina:', 'nuke-nopages-global' => "A-i é pa 'd pàgine neuve an [[Special:RecentChanges|ùltime modìfiche]].", + 'nuke-viewchanges' => 'varda modìfiche', ); /** Pashto (پښتو) @@ -2090,6 +2110,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Множественное удаление страниц]]', 'nuke-pattern' => 'Шаблон для имени страницы:', 'nuke-nopages-global' => 'В [[Special:RecentChanges|недавних изменениях]] нет новых страниц.', + 'nuke-viewchanges' => 'Внесённые изменения', ); /** Rusyn (Русиньскый) @@ -2230,6 +2251,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Izbriši več strani]]', 'nuke-pattern' => 'Vzorec imena strani:', 'nuke-nopages-global' => 'V [[Special:RecentChanges|zadnjih spremembah]] ni novih strani.', + 'nuke-viewchanges' => 'ogled sprememb', ); /** Serbian (Cyrillic script) (Српски (ћирилица)) @@ -2558,6 +2580,7 @@ 'nuke-delete-more' => '[[Special:Nuke|Xóa thêm trang]]', 'nuke-pattern' => 'Mẫu tên trang:', 'nuke-nopages-global' => 'Không có trang mới trong các [[Special:RecentChanges|thay đổi gần đây]].', + 'nuke-viewchanges' => 'xem thay đổi', ); /** Volapük (Volapük) Modified: trunk/extensions/Nuke/Nuke.php =================================================================== --- trunk/extensions/Nuke/Nuke.php 2012-03-21 19:21:18 UTC (rev 114393) +++ trunk/extensions/Nuke/Nuke.php 2012-03-21 19:25:49 UTC (rev 114394) @@ -4,7 +4,7 @@ die( 'Not an entry point.' ); } -define( 'Nuke_VERSION', '1.1.5' ); +define( 'Nuke_VERSION', '1.1.4' ); $dir = dirname(__FILE__) . '/'; @@ -15,7 +15,7 @@ 'path' => __FILE__, 'name' => 'Nuke', 'descriptionmsg' => 'nuke-desc', - 'author' => array( 'Brion Vibber', 'Jeroen De Dauw', 'Marcin Cieślak' ), + 'author' => array( 'Brion Vibber', 'Jeroen De Dauw' ), 'url' => 'https://www.mediawiki.org/wiki/Extension:Nuke', 'version' => Nuke_VERSION, ); Modified: trunk/extensions/Nuke/Nuke_body.php =================================================================== --- trunk/extensions/Nuke/Nuke_body.php 2012-03-21 19:21:18 UTC (rev 114393) +++ trunk/extensions/Nuke/Nuke_body.php 2012-03-21 19:25:49 UTC (rev 114394) @@ -7,18 +7,14 @@ } public function execute( $par ) { - if ( !$this->userCanExecute( $this->getUser() ) ) { + if( !$this->userCanExecute( $this->getUser() ) ) { $this->displayRestrictionError(); + return; } + $this->setHeaders(); $this->outputHeader(); - if ( $this->getUser()->isBlocked() ) { - $block = $this->getUser()->getBlock(); - throw new UserBlockedError( $block ); - } - $this->checkReadOnly(); - $req = $this->getRequest(); $target = trim( $req->getText( 'target', $par ) ); @@ -165,13 +161,11 @@ /** * @var $title Title */ - list( $title, $userName, $edits ) = $info; + list( $title, $userName ) = $info; $image = $title->getNamespace() == NS_IMAGE ? wfLocalFile( $title ) : false; $thumb = $image && $image->exists() ? $image->transform( array( 'width' => 120, 'height' => 120 ), 0 ) : false; - $changes = wfMsgExt( 'nchanges', 'parsemag', $this->getLanguage()->formatNum( $edits ) ); - $out->addHTML( '<li>' . Xml::check( 'pages[]', @@ -185,7 +179,7 @@ ( $userName ? wfMsgExt( 'nuke-editby', 'parseinline', $userName ) . ', ' : '' ) . Linker::linkKnown( $title, - $changes, + wfMsg( 'nuke-viewchanges' ), array(), array( 'action' => 'history' ) ) . @@ -210,29 +204,13 @@ protected function getNewPages( $username, $limit ) { $dbr = wfGetDB( DB_SLAVE ); - /** - * This is the worst-case query: - * - * SELECT rc_user_text, rc_namespace, rc_title, SUM(1) AS edits, MAX(rc_new) - * FROM recentchanges - * WHERE (rc_log_type IS NULL OR (rc_log_type = 'upload' AND rc_log_action='upload')) - * AND rc_title LIKE 'Test%' - * GROUP BY rc_user_text, rc_namespace, rc_title - * HAVING MIN(CASE - * WHEN rc_log_type IS NULL THEN 2 - * WHEN rc_log_type = 'upload' THEN 1 - * ELSE 0 END) = 1 - * OR MAX(rc_new) = 1 - * ORDER BY min(rc_timestamp) DESC; - * - */ - $what = array( 'rc_namespace', 'rc_title', + 'rc_timestamp', ); - $where = array( "(rc_log_type IS NULL) OR (rc_log_type = 'upload' AND rc_log_action = 'upload')" ); + $where = array( "(rc_new = 1) OR (rc_log_type = 'upload' AND rc_log_action = 'upload')" ); if ( $username === '' ) { $what[] = 'rc_user_text'; @@ -244,23 +222,15 @@ if ( !is_null( $pattern ) && trim( $pattern ) !== '' ) { $where[] = 'rc_title LIKE ' . $dbr->addQuotes( $pattern ); } - $group = implode( ', ', $what ); - $what[] = "sum(1) AS edits"; $result = $dbr->select( 'recentchanges', $what, $where, __METHOD__, array( - 'GROUP BY' => $group, - 'LIMIT' => $limit, - 'ORDER BY' => 'MIN(rc_timestamp) DESC', - 'HAVING' => <<<QUERY - MIN(CASE WHEN rc_log_type IS NULL THEN 2 - WHEN rc_log_type = 'upload' THEN 1 - ELSE 0 END) = 1 - OR MAX(rc_new) = 1 -QUERY + 'ORDER BY' => 'rc_timestamp DESC', + 'GROUP BY' => 'rc_namespace, rc_title', + 'LIMIT' => $limit ) ); @@ -269,8 +239,7 @@ foreach ( $result as $row ) { $pages[] = array( Title::makeTitle( $row->rc_namespace, $row->rc_title ), - $username === '' ? $row->rc_user_text : false, - $row->edits, + $username === '' ? $row->rc_user_text : false ); } @@ -290,12 +259,6 @@ $title = Title::newFromURL( $page ); $file = $title->getNamespace() == NS_FILE ? wfLocalFile( $title ) : false; - $permission_errors = $title->getUserPermissionsErrors( 'delete', $this->getUser()); - - if ( count( $permission_errors )) { - throw new PermissionsError( 'delete', $permission_errors ); - } - if ( $file ) { $oldimage = null; // Must be passed by reference $ok = FileDeleteForm::doDelete( $title, $file, $oldimage, $reason, false )->isOK(); Modified: trunk/extensions/Nuke/RELEASE-NOTES =================================================================== --- trunk/extensions/Nuke/RELEASE-NOTES 2012-03-21 19:21:18 UTC (rev 114393) +++ trunk/extensions/Nuke/RELEASE-NOTES 2012-03-21 19:25:49 UTC (rev 114394) @@ -1,14 +1,10 @@ These are the release notes for the Nuke extension. - + Extension page on mediawiki.org: https://www.mediawiki.org/wiki/Extension:Nuke Latest version of the release notes: http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Nuke/RELEASE-NOTES?view=co -=== Version 1.1.5 == -(2012-03-14) -* (bug 35214) Special:Nuke allows deletions even when blocked -* (bug 16985) Show number of recent edits in Special:Nuke -* (bug 23600) Nuke extension w/PostgreSQL: column "recentchanges.rc_timestamp" should be in GROUP BY + === Version 1.1.4 === (2012-2-12) @@ -37,4 +33,4 @@ === Version 1.1 === (2011-2-14) -* Added a changable limit and the option to not filter the recent changes on a single user. +* Added a changable limit and the option to not filter the recent changes on a single user. \ No newline at end of file _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
