[MediaWiki-CVS] SVN: [70214] trunk/phase3/languages/messages/MessagesMl.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70214 Revision: 70214 Author: raymond Date: 2010-07-31 08:03:05 + (Sat, 31 Jul 2010) Log Message: --- Bug 24601 - Add mpre namespace aliases for 'ml' Modified Paths: -- trunk/phase3/languages/messages/MessagesMl.php Modified: trunk/phase3/languages/messages/MessagesMl.php === --- trunk/phase3/languages/messages/MessagesMl.php 2010-07-31 02:26:23 UTC (rev 70213) +++ trunk/phase3/languages/messages/MessagesMl.php 2010-07-31 08:03:05 UTC (rev 70214) @@ -49,6 +49,7 @@ ); $namespaceAliases = array( + 'സം' = NS_TALK, 'അംഗം' = NS_USER, 'ഉ' = NS_USER, 'അംഗങ്ങളുടെ സംവാദം' = NS_USER_TALK, @@ -57,10 +58,17 @@ 'ചിസം' = NS_FILE_TALK, 'ചിത്രം' = NS_FILE, 'ചിത്രത്തിന്റെ_സംവാദം' = NS_FILE_TALK, + 'പ്ര' = NS_FILE, + 'പ്രസം' = NS_FILE_TALK, 'ഫ' = NS_TEMPLATE, 'ഫസം' = NS_TEMPLATE_TALK, 'വി' = NS_CATEGORY, + 'വ' = NS_CATEGORY, 'വിസം' = NS_CATEGORY_TALK, + 'വസം' = NS_CATEGORY_TALK, + 'മീ' = NS_MEDIAWIKI, + 'മീസം' = NS_MEDIAWIKI_TALK, + 'പ്രത്യേ' = NS_SPECIAL, 'വിഭാഗം' = NS_CATEGORY, 'വിഭാഗത്തിന്റെ_സംവാദം' = NS_CATEGORY_TALK, 'വർഗ്ഗം' = NS_CATEGORY, ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70215] trunk/phase3/maintenance/tests
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70215
Revision: 70215
Author: mglaser
Date: 2010-07-31 12:00:10 + (Sat, 31 Jul 2010)
Log Message:
---
changed testrunner in order to run suites instead of single tests. Patch
supplied by Dan Nessett
Modified Paths:
--
trunk/phase3/maintenance/tests/RunSeleniumTests.php
Added Paths:
---
trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTestCase.php
trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTestSuite.php
Removed Paths:
-
trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTest.php
Modified: trunk/phase3/maintenance/tests/RunSeleniumTests.php
===
--- trunk/phase3/maintenance/tests/RunSeleniumTests.php 2010-07-31 08:03:05 UTC
(rev 70214)
+++ trunk/phase3/maintenance/tests/RunSeleniumTests.php 2010-07-31 12:00:10 UTC
(rev 70215)
@@ -46,9 +46,9 @@
$logger = new SeleniumTestConsoleLogger;
$result-addListener( new SeleniumTestListener( $logger ) );
-$suite = new SeleniumTestSuite;
-foreach ( $wgSeleniumTests as $testClass ) {
- $suite-addTest( new $testClass );
+foreach ( $wgSeleniumTestSuites as $testSuiteName ) {
+ $suite = new $testSuiteName;
+ $suite-addTests();
+ $suite-run( $result );
}
-$suite-run( $result );
Deleted: trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTest.php
===
--- trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTest.php
2010-07-31 08:03:05 UTC (rev 70214)
+++ trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTest.php
2010-07-31 12:00:10 UTC (rev 70215)
@@ -1,21 +0,0 @@
-?php
-
-class SimpleSeleniumTest extends SeleniumTestCase
-{
- public $name = Basic selenium test;
-
- public function runTest()
- {
- $this-open( Selenium::getBaseUrl() .
'/index.php?title=Seleniumaction=edit' );
- $this-type( wpTextbox1, This is a basic test );
- $this-click( wpPreview );
- $this-waitForPageToLoad( 1 );
-
- // check result
- $source = $this-getText( //d...@id='wikiPreview']/p );
- $correct = strstr( $source, This is a basic test );
- $this-assertEquals( $correct, true );
-
- }
-
-}
Copied: trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTestCase.php
(from rev 70213, trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTest.php)
===
--- trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTestCase.php
(rev 0)
+++ trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTestCase.php
2010-07-31 12:00:10 UTC (rev 70215)
@@ -0,0 +1,24 @@
+?php
+
+class SimpleSeleniumTestCase extends SeleniumTestCase
+{
+ public function __construct( $name = 'Basic selenium test') {
+ parent::__construct( $name );
+ }
+
+ public function runTest()
+ {
+ $this-open( Selenium::getBaseUrl() .
+ '/index.php?title=Seleniumaction=edit' );
+ $this-type( wpTextbox1, This is a basic test );
+ $this-click( wpPreview );
+ $this-waitForPageToLoad( 1 );
+
+ // check result
+ $source = $this-getText( //d...@id='wikiPreview']/p );
+ $correct = strstr( $source, This is a basic test );
+ $this-assertEquals( $correct, true );
+
+ }
+
+}
Added: trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTestSuite.php
===
--- trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTestSuite.php
(rev 0)
+++ trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTestSuite.php
2010-07-31 12:00:10 UTC (rev 70215)
@@ -0,0 +1,15 @@
+ ?php
+
+require_once(dirname( __FILE__ ) . '/SimpleSeleniumTestCase.php');
+
+class SimpleSeleniumTestSuite extends SeleniumTestSuite
+{
+ public function __construct( $name = 'Basic selenium test suite') {
+ parent::__construct( $name );
+ }
+
+ public function addTests() {
+ $test = new SimpleSeleniumTestCase();
+ parent::addTest( $test );
+ }
+}
Property changes on:
trunk/phase3/maintenance/tests/selenium/SimpleSeleniumTestSuite.php
___
Added: svn:keywords
+ LastChangedDate LastChangedBy Revision Id
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70216] trunk/phase3/includes/AutoLoader.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70216 Revision: 70216 Author: mglaser Date: 2010-07-31 12:01:12 + (Sat, 31 Jul 2010) Log Message: --- load selenium test suite instead of single test Modified Paths: -- trunk/phase3/includes/AutoLoader.php Modified: trunk/phase3/includes/AutoLoader.php === --- trunk/phase3/includes/AutoLoader.php2010-07-31 12:00:10 UTC (rev 70215) +++ trunk/phase3/includes/AutoLoader.php2010-07-31 12:01:12 UTC (rev 70216) @@ -674,7 +674,7 @@ 'UploadFromUrlTest' = 'maintenance/tests/UploadFromUrlTest.php', # maintenance/tests/selenium - 'SimpleSeleniumTest' = 'maintenance/tests/selenium/SimpleSeleniumTest.php', + 'SimpleSeleniumTestSuite' = 'maintenance/tests/selenium/SimpleSeleniumTestSuite.php', 'Selenium' = 'maintenance/tests/selenium/Selenium.php', 'SeleniumLoader' = 'maintenance/tests/selenium/SeleniumLoader.php', 'SeleniumTestCase' = 'maintenance/tests/selenium/SeleniumTestCase.php', @@ -682,7 +682,6 @@ 'SeleniumTestHTMLLogger' = 'maintenance/tests/selenium/SeleniumTestHTMLLogger.php', 'SeleniumTestListener' = 'maintenance/tests/selenium/SeleniumTestListener.php', 'SeleniumTestSuite' = 'maintenance/tests/selenium/SeleniumTestSuite.php', - 'SimpleSeleniumTest' = 'maintenance/tests/selenium/SimpleSeleniumTest.php', # maintenance/language 'csvStatsOutput' = 'maintenance/language/StatOutputs.php', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70217] trunk/phase3/includes/DefaultSettings.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70217 Revision: 70217 Author: mglaser Date: 2010-07-31 12:01:55 + (Sat, 31 Jul 2010) Log Message: --- changed selenium settings to load simple selenium test suite instead of a single test Modified Paths: -- trunk/phase3/includes/DefaultSettings.php Modified: trunk/phase3/includes/DefaultSettings.php === --- trunk/phase3/includes/DefaultSettings.php 2010-07-31 12:01:12 UTC (rev 70216) +++ trunk/phase3/includes/DefaultSettings.php 2010-07-31 12:01:55 UTC (rev 70217) @@ -3749,9 +3749,9 @@ */ $wgEnableSelenium = false; -/** List of Selenium test classes. These must be registered with the autoloader. */ -$wgSeleniumTests = array( - 'SimpleSeleniumTest' +/** List of Selenium test suites. These must be registered with the autoloader. */ +$wgSeleniumTestSuites = array( + 'SimpleSeleniumTestSuite' ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70218] trunk/extensions/Translate/tag/PageTranslationHooks.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70218
Revision: 70218
Author: nikerabbit
Date: 2010-07-31 15:41:40 + (Sat, 31 Jul 2010)
Log Message:
---
title no longer public
Modified Paths:
--
trunk/extensions/Translate/tag/PageTranslationHooks.php
Modified: trunk/extensions/Translate/tag/PageTranslationHooks.php
===
--- trunk/extensions/Translate/tag/PageTranslationHooks.php 2010-07-31
12:01:55 UTC (rev 70217)
+++ trunk/extensions/Translate/tag/PageTranslationHooks.php 2010-07-31
15:41:40 UTC (rev 70218)
@@ -68,7 +68,7 @@
}
// Finally we know the title and can construct a Translatable
page
- $page = TranslatablePage::newFromTitle( $group-title );
+ $page = TranslatablePage::newFromTitle( $group-getTitle() );
// Add a tracking mark
if ( $revision !== null ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70219] branches/resourceloader/phase3/includes/ResourceLoader.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70219
Revision: 70219
Author: tparscal
Date: 2010-07-31 17:09:06 + (Sat, 31 Jul 2010)
Log Message:
---
Added theme and locale support. Added parameter passing through mw.config.
Reduced simple register statements to a single call.
Modified Paths:
--
branches/resourceloader/phase3/includes/ResourceLoader.php
Modified: branches/resourceloader/phase3/includes/ResourceLoader.php
===
--- branches/resourceloader/phase3/includes/ResourceLoader.php 2010-07-31
15:41:40 UTC (rev 70218)
+++ branches/resourceloader/phase3/includes/ResourceLoader.php 2010-07-31
17:09:06 UTC (rev 70219)
@@ -29,6 +29,15 @@
* 'script' = 'resources/foo/foo.js',
* // Optionally you can have a style file as well
* 'style' = 'resources/foo/foo.css',
+ * // List of styles to include based on the skin
+ * 'themes' = array(
+ * 'default' = 'resources/foo/themes/default/foo.css',
+ * 'vector' = 'resources/foo/themes/vector.foo.css',
+ * ),
+ * // List of scripts to include based on the language
+ * 'locales' = array(
+ * 'en-gb' = 'resources/foo/locales/en-gb.js',
+ * ),
* // Only needed if you are doing something fancy with your
loader, otherwise one will be generated for you
* 'loader' = 'resources/foo/loader.js',
* // If you need any localized messages brought into the
JavaScript environment, list the keys here
@@ -100,8 +109,10 @@
* array(
* 'script' = [string: path to file],
* 'style' = [string: path to file, optional],
+* 'themes' = [array: paths to styles to include, keyed
by skin name, optional],
+* 'locales' = [array: paths to scripts to include, keyed
by locale name, optional],
+* 'messages' = [array: message keys, optional],
* 'loader' = [string: path to file, optional],
-* 'messages' = [array: message keys, optional],
* 'raw' = [boolean: include directly without any loading
support, optional],
* 'debug' = [boolean: include in debug mode only,
optional],
* )
@@ -129,6 +140,8 @@
$options = array_merge( array(
'script' = null,
'style' = null,
+ 'themes' = array(),
+ 'locales' = array(),
'messages' = array(),
'loader' = null,
'raw' = false,
@@ -204,33 +217,35 @@
echo \n;
}
}
- // Special meta-information for the 'mw' module
- if ( in_array( 'mw', $modules ) ) {
+ // Special meta-information for the 'mediawiki' module
+ if ( in_array( 'mediawiki', $modules ) ) {
+ /*
+* Skin::makeGlobalVariablesScript needs to be modified
so that we still output the globals for now, but also
+* put them into the initial payload like this:
+*
+* // Sets the inital configuration
+* mw.config.set( { 'name': 'value', ... }
);
+*
+* Also, the naming of these variables is horrible and
sad, hopefully this can be worked on
+*/
+ echo mw.config.set( . json_encode( $parameters ) .
);\n;
// Collect all loaders
$loaders = array();
+ $registers = array();
foreach ( self::$modules as $name = $options ) {
if ( $options['loader'] !== null ) {
$loaders[] = $options['loader'];
+ } else {
+ $registers[] = $name;
}
}
- // Include each loader once
+ // Include loaders
foreach ( array_unique( $loaders ) as $loader ) {
readfile( $loader );
echo \n;
}
- // Configure debug mode on server
- if ( $parameters['debug'] ) {
- echo mw.debug = true;\n;
- }
- /*
-* Skin::makeGlobalVariablesScript needs to be modified
so that we still output the
[MediaWiki-CVS] SVN: [70221] trunk/extensions/Maps/Maps.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70221 Revision: 70221 Author: jeroendedauw Date: 2010-07-31 17:46:41 + (Sat, 31 Jul 2010) Log Message: --- Removed Yaron as author upon request Modified Paths: -- trunk/extensions/Maps/Maps.php Modified: trunk/extensions/Maps/Maps.php === --- trunk/extensions/Maps/Maps.php 2010-07-31 17:10:31 UTC (rev 70220) +++ trunk/extensions/Maps/Maps.php 2010-07-31 17:46:41 UTC (rev 70221) @@ -132,7 +132,6 @@ 'version' = Maps_VERSION, 'author' = array( '[http://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]', - '[http://www.mediawiki.org/wiki/User:Yaron_Koren Yaron Koren]', '[http://www.ohloh.net/p/maps/contributors others]' ), 'url' = 'http://www.mediawiki.org/wiki/Extension:Maps', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70222] trunk/extensions/SemanticMaps/SemanticMaps.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70222 Revision: 70222 Author: jeroendedauw Date: 2010-07-31 17:46:46 + (Sat, 31 Jul 2010) Log Message: --- Removed Yaron as author upon request Modified Paths: -- trunk/extensions/SemanticMaps/SemanticMaps.php Modified: trunk/extensions/SemanticMaps/SemanticMaps.php === --- trunk/extensions/SemanticMaps/SemanticMaps.php 2010-07-31 17:46:41 UTC (rev 70221) +++ trunk/extensions/SemanticMaps/SemanticMaps.php 2010-07-31 17:46:46 UTC (rev 70222) @@ -86,7 +86,6 @@ 'version' = SM_VERSION, 'author' = array( '[http://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]', - '[http://www.mediawiki.org/wiki/User:Yaron_Koren Yaron Koren]', '[http://www.ohloh.net/p/semanticmaps/contributors others]' ), 'url' = 'http://www.mediawiki.org/wiki/Extension:Semantic_Maps', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70223] trunk/extensions/Translate/groups/Wikia/extensions.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70223 Revision: 70223 Author: siebrand Date: 2010-07-31 18:05:05 + (Sat, 31 Jul 2010) Log Message: --- Add support for Wikia's SliderTag extension Modified Paths: -- trunk/extensions/Translate/groups/Wikia/extensions.txt Modified: trunk/extensions/Translate/groups/Wikia/extensions.txt === --- trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-07-31 17:46:46 UTC (rev 70222) +++ trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-07-31 18:05:05 UTC (rev 70223) @@ -139,6 +139,8 @@ file = SiteWideMessages/SpecialSiteWideMessages.i18n.php ignored = swm-expire-options +Slider Tag + Special Interwiki Edit Special Mini Upload ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70224] trunk/extensions/Translate/groups/Wikia/extensions.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70224 Revision: 70224 Author: siebrand Date: 2010-07-31 18:10:22 + (Sat, 31 Jul 2010) Log Message: --- Add support for Wikia's CommunityMessages extension Modified Paths: -- trunk/extensions/Translate/groups/Wikia/extensions.txt Modified: trunk/extensions/Translate/groups/Wikia/extensions.txt === --- trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-07-31 18:05:05 UTC (rev 70223) +++ trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-07-31 18:10:22 UTC (rev 70224) @@ -29,6 +29,8 @@ Comments Forum file = CommentsForum/Forum.i18n.php +Community Messages + Contest Tool file = ContestTool/SpecialContestTool.i18n.php ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70225] trunk/phase3/maintenance/Maintenance.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70225
Revision: 70225
Author: platonides
Date: 2010-07-31 18:29:20 + (Sat, 31 Jul 2010)
Log Message:
---
Remove useless $DP.
Roan confirmed that there was no hidden usage on wmf-config/
The '$DP = $IP;' in CommonSettings.php:94 should be removed, too.
Modified Paths:
--
trunk/phase3/maintenance/Maintenance.php
Modified: trunk/phase3/maintenance/Maintenance.php
===
--- trunk/phase3/maintenance/Maintenance.php2010-07-31 18:10:22 UTC (rev
70224)
+++ trunk/phase3/maintenance/Maintenance.php2010-07-31 18:29:20 UTC (rev
70225)
@@ -740,7 +740,6 @@
putenv( 'wikilang=' . $lang );
- $DP = $IP;
ini_set( 'include_path',
.:$IP:$IP/includes:$IP/languages:$IP/maintenance );
if ( $lang == 'test' $site == 'wikipedia' ) {
@@ -753,7 +752,7 @@
* @return String
*/
public function loadSettings() {
- global $wgWikiFarm, $wgCommandLineMode, $IP, $DP;
+ global $wgWikiFarm, $wgCommandLineMode, $IP;
$wgWikiFarm = false;
if ( isset( $this-mOptions['conf'] ) ) {
@@ -775,7 +774,6 @@
must exist and be readable in
the source directory., true );
}
$wgCommandLineMode = true;
- $DP = $IP;
return $settingsFile;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70226] trunk/extensions/GlobalUsage/ApiQueryGlobalUsage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70226
Revision: 70226
Author: platonides
Date: 2010-07-31 18:31:40 + (Sat, 31 Jul 2010)
Log Message:
---
Eclipse will hardly be able to open ApiQueryBase.php, which is not on this
folder.
Modified Paths:
--
trunk/extensions/GlobalUsage/ApiQueryGlobalUsage.php
Modified: trunk/extensions/GlobalUsage/ApiQueryGlobalUsage.php
===
--- trunk/extensions/GlobalUsage/ApiQueryGlobalUsage.php2010-07-31
18:29:20 UTC (rev 70225)
+++ trunk/extensions/GlobalUsage/ApiQueryGlobalUsage.php2010-07-31
18:31:40 UTC (rev 70226)
@@ -22,11 +22,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-if ( !defined( 'MEDIAWIKI' ) ) {
- // Eclipse helper - will be ignored in production
- require_once ( ApiQueryBase.php );
-}
-
class ApiQueryGlobalUsage extends ApiQueryBase {
public function __construct( $query, $moduleName ) {
parent :: __construct( $query, $moduleName, 'gu' );
@@ -139,4 +134,4 @@
public function getVersion() {
return __CLASS__ . ': $Id$';
}
-}
\ No newline at end of file
+}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70227] trunk/extensions/Translate/groups/Wikia/extensions.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70227 Revision: 70227 Author: siebrand Date: 2010-07-31 18:38:52 + (Sat, 31 Jul 2010) Log Message: --- Add support for Wikia's HealthCheck extension Modified Paths: -- trunk/extensions/Translate/groups/Wikia/extensions.txt Modified: trunk/extensions/Translate/groups/Wikia/extensions.txt === --- trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-07-31 18:31:40 UTC (rev 70226) +++ trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-07-31 18:38:52 UTC (rev 70227) @@ -69,6 +69,9 @@ HA Welcome ignored = welcome-enabled, welcome-user +Health Check +file = SpecialHealthCheck/HealthCheck.i18n.php + Helper Panel Image Placeholder ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70228] trunk/extensions/Translate/groups/Wikia/extensions.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70228 Revision: 70228 Author: siebrand Date: 2010-07-31 18:49:13 + (Sat, 31 Jul 2010) Log Message: --- Fix path Modified Paths: -- trunk/extensions/Translate/groups/Wikia/extensions.txt Modified: trunk/extensions/Translate/groups/Wikia/extensions.txt === --- trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-07-31 18:38:52 UTC (rev 70227) +++ trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-07-31 18:49:13 UTC (rev 70228) @@ -70,7 +70,7 @@ ignored = welcome-enabled, welcome-user Health Check -file = SpecialHealthCheck/HealthCheck.i18n.php +file = SpecialHealthcheck/HealthCheck.i18n.php Helper Panel ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70229] trunk/extensions/Nuke/Nuke_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70229 Revision: 70229 Author: reedy Date: 2010-07-31 19:25:54 + (Sat, 31 Jul 2010) Log Message: --- Fixup r70005 per CR (Hey, I only applied the patch ;)) Modified Paths: -- trunk/extensions/Nuke/Nuke_body.php Modified: trunk/extensions/Nuke/Nuke_body.php === --- trunk/extensions/Nuke/Nuke_body.php 2010-07-31 18:49:13 UTC (rev 70228) +++ trunk/extensions/Nuke/Nuke_body.php 2010-07-31 19:25:54 UTC (rev 70229) @@ -122,7 +122,7 @@ array( 'rc_namespace', 'rc_title', 'rc_timestamp', 'COUNT(*) AS edits' ), array( 'rc_user_text' = $username, - '(rc_new = 1) OR (rc_log_type = import AND rc_log_action = upload)' + (rc_new = 1) OR (rc_log_type = 'import' AND rc_log_action = 'upload') ), __METHOD__, array( ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70230] trunk/extensions/MetavidWiki
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70230 Revision: 70230 Author: platonides Date: 2010-07-31 19:28:18 + (Sat, 31 Jul 2010) Log Message: --- Use ?php instead of ? tags Remove ? at end of file Use dirname( __FILE__ ) for the requires. htmlspecialchars() Modified Paths: -- trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php trunk/extensions/MetavidWiki/includes/MV_Settings.php trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_playlists.php trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_timed_text.php trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/MvFlv.php trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/mvFlvServer.php trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Bitstream.php trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Flac.php trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Media.php trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Speex.php trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Theora.php trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Vorbis.php Modified: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php === --- trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php 2010-07-31 19:25:54 UTC (rev 70229) +++ trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php 2010-07-31 19:28:18 UTC (rev 70230) @@ -1,4 +1,4 @@ -? +?php /** * Global functions and constants for Metavid MediaWiki. * Modified: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php === --- trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php 2010-07-31 19:25:54 UTC (rev 70229) +++ trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php 2010-07-31 19:28:18 UTC (rev 70230) @@ -1,4 +1,4 @@ -? +?php /* * Created on Jun 28, 2007 * Modified: trunk/extensions/MetavidWiki/includes/MV_Settings.php === --- trunk/extensions/MetavidWiki/includes/MV_Settings.php 2010-07-31 19:25:54 UTC (rev 70229) +++ trunk/extensions/MetavidWiki/includes/MV_Settings.php 2010-07-31 19:28:18 UTC (rev 70230) @@ -1,4 +1,4 @@ -? +?php if ( !defined( 'MEDIAWIKI' ) ) die( 1 ); # ## Modified: trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php === --- trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php 2010-07-31 19:25:54 UTC (rev 70229) +++ trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php 2010-07-31 19:28:18 UTC (rev 70230) @@ -10,7 +10,7 @@ * @url http://metavid.org */ - $cur_path = $IP = dirname( __FILE__ ); +$cur_path = $IP = dirname( __FILE__ ); // include commandLine.inc from the mediaWiki maintance dir: require_once ( '../../../maintenance/commandLine.inc' ); require_once ( 'metavid2mvWiki.inc.php' ); Modified: trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php === --- trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php 2010-07-31 19:25:54 UTC (rev 70229) +++ trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php 2010-07-31 19:28:18 UTC (rev 70230) @@ -104,4 +104,4 @@ /html ?php } -? \ No newline at end of file + Modified: trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_playlists.php === --- trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_playlists.php 2010-07-31 19:25:54 UTC (rev 70229) +++ trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_playlists.php 2010-07-31 19:28:18 UTC (rev 70230) @@ -17,7 +17,7 @@ h3 Sample Playlists/h3 The bdefault attributes:/b: span id=default_attr -? +?php $sample_embed = array(); // playlist tags: @@ -84,4 +84,4 @@ /html ?php } -? + Modified: trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_timed_text.php === --- trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_timed_text.php 2010-07-31 19:25:54 UTC (rev 70229) +++ trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_timed_text.php 2010-07-31 19:28:18 UTC (rev 70230)
[MediaWiki-CVS] SVN: [70231] trunk/phase3/includes/api
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70231
Revision: 70231
Author: reedy
Date: 2010-07-31 19:53:43 + (Sat, 31 Jul 2010)
Log Message:
---
Move a few braces noticed while doing CR
Modified Paths:
--
trunk/phase3/includes/api/ApiQueryRecentChanges.php
trunk/phase3/includes/api/ApiQueryUserContributions.php
Modified: trunk/phase3/includes/api/ApiQueryRecentChanges.php
===
--- trunk/phase3/includes/api/ApiQueryRecentChanges.php 2010-07-31 19:28:18 UTC
(rev 70230)
+++ trunk/phase3/includes/api/ApiQueryRecentChanges.php 2010-07-31 19:53:43 UTC
(rev 70231)
@@ -197,8 +197,7 @@
/* Set up internal members based upon params. */
$this-initProperties( $prop );
- if ( $this-fld_patrolled !$wgUser-useRCPatrol()
!$wgUser-useNPPatrol() )
- {
+ if ( $this-fld_patrolled !$wgUser-useRCPatrol()
!$wgUser-useNPPatrol() ) {
$this-dieUsage( 'You need the patrol right to
request the patrolled flag', 'permissiondenied' );
}
@@ -219,8 +218,7 @@
$this-addFieldsIf( 'rc_log_type', $this-fld_loginfo );
$this-addFieldsIf( 'rc_log_action', $this-fld_loginfo
);
$this-addFieldsIf( 'rc_params', $this-fld_loginfo );
- if ( $this-fld_redirect || isset( $show['redirect'] )
|| isset( $show['!redirect'] ) )
- {
+ if ( $this-fld_redirect || isset( $show['redirect'] )
|| isset( $show['!redirect'] ) ) {
$this-addTables( 'page' );
$this-addJoinConds( array( 'page' = array(
'LEFT JOIN', array( 'rc_namespace=page_namespace', 'rc_title=page_title' ) ) )
);
$this-addFields( 'page_is_redirect' );
Modified: trunk/phase3/includes/api/ApiQueryUserContributions.php
===
--- trunk/phase3/includes/api/ApiQueryUserContributions.php 2010-07-31
19:28:18 UTC (rev 70230)
+++ trunk/phase3/includes/api/ApiQueryUserContributions.php 2010-07-31
19:53:43 UTC (rev 70231)
@@ -186,8 +186,7 @@
if ( !is_null( $show ) ) {
$show = array_flip( $show );
if ( ( isset( $show['minor'] ) isset(
$show['!minor'] ) )
- || ( isset( $show['patrolled'] )
isset( $show['!patrolled'] ) ) )
- {
+ || ( isset( $show['patrolled'] )
isset( $show['!patrolled'] ) ) ) {
$this-dieUsageMsg( array( 'show' ) );
}
@@ -211,8 +210,7 @@
) );
if ( isset( $show['patrolled'] ) || isset( $show['!patrolled']
) ||
-$this-fld_patrolled )
- {
+$this-fld_patrolled ) {
if ( !$wgUser-useRCPatrol() !$wgUser-useNPPatrol()
) {
$this-dieUsage( 'You need the patrol right to
request the patrolled flag', 'permissiondenied' );
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70232] branches/img_metadata/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70232
Revision: 70232
Author: bawolff
Date: 2010-07-31 20:03:27 + (Sat, 31 Jul 2010)
Log Message:
---
Some (very initial) xmp stuff.
Modified Paths:
--
branches/img_metadata/phase3/includes/AutoLoader.php
Added Paths:
---
branches/img_metadata/phase3/includes/media/XMP.php
Modified: branches/img_metadata/phase3/includes/AutoLoader.php
===
--- branches/img_metadata/phase3/includes/AutoLoader.php2010-07-31
19:53:43 UTC (rev 70231)
+++ branches/img_metadata/phase3/includes/AutoLoader.php2010-07-31
20:03:27 UTC (rev 70232)
@@ -460,6 +460,7 @@
'ThumbnailImage' = 'includes/media/MediaTransformOutput.php',
'TiffHandler' = 'includes/media/Tiff.php',
'TransformParameterError' = 'includes/media/MediaTransformOutput.php',
+ 'XMPReader' = 'includes/media/XMP.php',
# includes/normal
'UtfNormal' = 'includes/normal/UtfNormal.php',
Added: branches/img_metadata/phase3/includes/media/XMP.php
===
--- branches/img_metadata/phase3/includes/media/XMP.php
(rev 0)
+++ branches/img_metadata/phase3/includes/media/XMP.php 2010-07-31 20:03:27 UTC
(rev 70232)
@@ -0,0 +1,734 @@
+?php
+/** Class for reading xmp data containing properties relevent to
+* images, and spitting out an array that FormatExif accepts.
+*
+* It should be noted this is not done yet
+*
+* Note, this is not meant to recognize every possible thing you can
+* encode in XMP. It should recognize all the properties we want.
+* For example it doesn't have support for structures with multiple
+* nesting levels, as none of the properties we're supporting use that
+* feature. If it comes across properties it doesn't recognize, it should
+* ignore them.
+*
+* The main methods one would call in this class are
+* - parse( $content )
+* Reads in xmp content.
+* - getResults
+* Outputs a results array.
+*
+*/
+class XMPReader {
+
+ private $curItem = array();
+ private $ancestorStruct = false;
+ private $charContent = false;
+ private $mode = array();
+ private $results = array();
+ private $processingArray = false;
+
+ private $xmlParser;
+
+ protected $items; // Contains an array of all properties we try to
extract.
+
+ /*
+ * These are various mode constants.
+ * they are used to figure out what to do
+ * with an element when its encoutered.
+ *
+ * For example, MODE_IGNORE is used when processing
+ * a property we're not interested in. So if a new
+ * element pops up when we're in that mode, we ignore it.
+ */
+ const MODE_INITIAL = 0;
+ const MODE_IGNORE = 1;
+ const MODE_LI = 2;
+
+ // The following MODE constants are also used in the
+ // $items array to denote what type of property the item is.
+ const MODE_SIMPLE = 3;
+ const MODE_STRUCT = 4; // structure (associative array)
+ const MODE_SEQ= 5; // orderd list
+ const MODE_BAG= 6; // unordered list
+ const MODE_LANG = 7; // lang alt. TODO: implement
+ const MODE_ALT= 8; // non-language alt. Currently unused
+
+ const NS_RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
+
+
+ /** Constructor.
+ *
+ * Primary job is to intialize the items array
+ * which is used to determine which props to extract.
+ */
+ function __construct() {
+
+ /*
+ * $this-items keeps a list of all the items
+ * we are interested to extract, as well as
+ * information about the item like what type
+ * it is.
+ *
+ * Format is an array of namespaces,
+ * each containing an array of tags
+ * each tag is an array of information about the
+ * tag, including:
+ * * map_group - what group (used for precedence during
conflicts)
+ * * mode - What type of item (self::MODE_SIMPLE usually,
see above for all values)
+ * * validate - method to validate input. Could also
post-process the input. (TODO: implement this)
+ * * choices - array of potential values (format of
'value' = true )
+ * * children - for MODE_STRUCT items, allowed children.
+ *
+ * currently this just has a bunch of exif values as this class
is only half-done
+ */
+
+ $this-items = array(
+ 'http://ns.adobe.com/exif/1.0/' = array(
+ 'ApertureValue' = array(
+ 'map_group' = 'exif',
+ 'mode' =
[MediaWiki-CVS] SVN: [70233] trunk/extensions/LiquidThreads/classes/NewMessagesController. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70233
Revision: 70233
Author: reedy
Date: 2010-07-31 20:04:25 + (Sat, 31 Jul 2010)
Log Message:
---
version_compare( $wgVersion, '1.15.999', '=' ) to version_compare( $wgVersion,
'1.16', '' )
Bit of normalisation (usage of the other already there)
Add a couple of braces
Modified Paths:
--
trunk/extensions/LiquidThreads/classes/NewMessagesController.php
Modified: trunk/extensions/LiquidThreads/classes/NewMessagesController.php
===
--- trunk/extensions/LiquidThreads/classes/NewMessagesController.php
2010-07-31 20:03:27 UTC (rev 70232)
+++ trunk/extensions/LiquidThreads/classes/NewMessagesController.php
2010-07-31 20:04:25 UTC (rev 70233)
@@ -123,7 +123,7 @@
$fields = array( 'wl_user', 'ums_user', 'ums_read_timestamp' );
global $wgVersion;
- if ( version_compare( $wgVersion, '1.15.999', '=' ) ) {
+ if ( version_compare( $wgVersion, '1.16', '' ) ) {
$oldPrefCompat = true;
$tables[] = 'user';
@@ -175,7 +175,7 @@
global $wgVersion;
- if ( version_compare( $wgVersion, '1.15.999', '=' ) ) {
+ if ( version_compare( $wgVersion, '1.16', '' ) ) {
$decodedOptions = self::decodeUserOptions(
$row-user_options );
$wantsTalkNotification = !isset(
$decodedOptions['lqtnotifytalk'] );
@@ -392,8 +392,9 @@
$cval = $wgMemc-get( wfMemcKey( 'lqt-new-messages-count',
$user-getId() ) );
- if ( $cval )
+ if ( $cval ) {
return $cval;
+ }
$dbr = wfGetDB( DB_SLAVE );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70234] branches/MwEmbedStandAlone
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70234
Revision: 70234
Author: dale
Date: 2010-07-31 20:15:33 + (Sat, 31 Jul 2010)
Log Message:
---
* improved mw.log removal ( supports basic tokeniser to avoid broken mw.log
removal )
* minor log clean up for swarmTransport
Modified Paths:
--
branches/MwEmbedStandAlone/ResourceLoader.php
branches/MwEmbedStandAlone/modules/SwarmTransport/mw.SwarmTransport.js
Modified: branches/MwEmbedStandAlone/ResourceLoader.php
===
--- branches/MwEmbedStandAlone/ResourceLoader.php 2010-07-31 20:04:25 UTC
(rev 70233)
+++ branches/MwEmbedStandAlone/ResourceLoader.php 2010-07-31 20:15:33 UTC
(rev 70234)
@@ -27,6 +27,7 @@
$myResourceLoader-doResourceLoader();
}
+
class ResourceLoader {
// The list of named javascript css files
@@ -811,7 +812,7 @@
global $wgEnableScriptLocalization;
// Strip out mw.log debug lines (if not in debug mode)
if( !$this-debug ){
- $scriptText = preg_replace(
'/\n\s*mw\.log\(([^\)]*\))*\s*[\;\n]/U', \n, $scriptText );
+ $scriptText = $this-removeLogStatments( $scriptText );
}
// Do language swap by index:
@@ -854,6 +855,63 @@
// Return the javascript str unmodified if we did not transform
with the localisation
return $scriptText;
}
+ /**
+* Remove all occurances of mw.log( 'some js string or expresion' );
+* @param {string} $jsString
+*/
+ static function removeLogStatments( $jsString ){
+ $outputJs = '';
+ for ( $i = 0; $i strlen( $jsString ); $i++ ) {
+ // find next occurance of
+ preg_match( '/[\n;]\s*mw\.log\s*/', $jsString,
$matches, PREG_OFFSET_CAPTURE, $i );
+ // check if any matches are left:
+ if( count( $matches ) == 0){
+ $outputJs .= substr( $jsString, $i );
+ break;
+ }
+ if( count( $matches ) 0 ){
+ $startOfLogIndex = strlen( $matches[0][0] ) +
$matches[0][1];
+ // append everytnig up to this point:
+ $outputJs .= substr( $jsString, $i, (
$startOfLogIndex - strlen( $matches[0][0] ) )-$i );
+
+ // Increment i to position of closing ) not
inside quotes
+ $parenthesesDepth = 0;
+ $ignorenext = false;
+ $inquote = false;
+ for ( $i = $startOfLogIndex; $i strlen(
$jsString ); $i++ ) {
+ $char = $jsString[$i];
+ if ( $ignorenext ) {
+ $ignorenext = false;
+ } else {
+ // Search for a close ) that is
not in quotes
+ switch( $char ) {
+ case '':
+ $inquote =
!$inquote;
+ break;
+ case '(':
+ if( !
$inquote){
+
$parenthesesDepth++;
+ }
+ break;
+ case ')':
+ if( ! $inquote
){
+
$parenthesesDepth--;
+ }
+ break;
+ case '\\':
+ if ( $inquote )
$ignorenext = true;
+ break;
+ }
+ // done with close parentheses
search for next mw.log in outer loop:
+ if( $parenthesesDepth === 0 ){
+
[MediaWiki-CVS] SVN: [70236] branches/MwEmbedStandAlone/ResourceLoader.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70236
Revision: 70236
Author: dale
Date: 2010-07-31 20:20:25 + (Sat, 31 Jul 2010)
Log Message:
---
fixed removeLogStatements function name spelling
Modified Paths:
--
branches/MwEmbedStandAlone/ResourceLoader.php
Modified: branches/MwEmbedStandAlone/ResourceLoader.php
===
--- branches/MwEmbedStandAlone/ResourceLoader.php 2010-07-31 20:20:02 UTC
(rev 70235)
+++ branches/MwEmbedStandAlone/ResourceLoader.php 2010-07-31 20:20:25 UTC
(rev 70236)
@@ -812,7 +812,7 @@
global $wgEnableScriptLocalization;
// Strip out mw.log debug lines (if not in debug mode)
if( !$this-debug ){
- $scriptText = $this-removeLogStatments( $scriptText );
+ $scriptText = $this-removeLogStatements( $scriptText );
}
// Do language swap by index:
@@ -859,7 +859,7 @@
* Remove all occurances of mw.log( 'some js string or expresion' );
* @param {string} $jsString
*/
- static function removeLogStatments( $jsString ){
+ static function removeLogStatements( $jsString ){
$outputJs = '';
for ( $i = 0; $i strlen( $jsString ); $i++ ) {
// find next occurance of
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70237] trunk/extensions/WebStore
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70237 Revision: 70237 Author: platonides Date: 2010-07-31 21:11:28 + (Sat, 31 Jul 2010) Log Message: --- No need to do realpath() to __FILE__ from PHP 4.0.2 Remove ? at end of file Modified Paths: -- trunk/extensions/WebStore/WebStoreStart.php trunk/extensions/WebStore/delete.php trunk/extensions/WebStore/inplace-scaler.php trunk/extensions/WebStore/metadata.php trunk/extensions/WebStore/publish.php Modified: trunk/extensions/WebStore/WebStoreStart.php === --- trunk/extensions/WebStore/WebStoreStart.php 2010-07-31 20:20:25 UTC (rev 70236) +++ trunk/extensions/WebStore/WebStoreStart.php 2010-07-31 21:11:28 UTC (rev 70237) @@ -5,7 +5,7 @@ */ -$IP = dirname( realpath( __FILE__ ) ) . '/../..'; +$IP = dirname( __FILE__ ) . '/../..'; chdir( $IP ); require( './includes/WebStart.php' ); Modified: trunk/extensions/WebStore/delete.php === --- trunk/extensions/WebStore/delete.php2010-07-31 20:20:25 UTC (rev 70236) +++ trunk/extensions/WebStore/delete.php2010-07-31 21:11:28 UTC (rev 70237) @@ -59,4 +59,3 @@ $d = new WebStoreDelete; $d-execute(); -? Modified: trunk/extensions/WebStore/inplace-scaler.php === --- trunk/extensions/WebStore/inplace-scaler.php2010-07-31 20:20:25 UTC (rev 70236) +++ trunk/extensions/WebStore/inplace-scaler.php2010-07-31 21:11:28 UTC (rev 70237) @@ -133,4 +133,3 @@ $s = new InplaceScaler; $s-execute(); -? Modified: trunk/extensions/WebStore/metadata.php === --- trunk/extensions/WebStore/metadata.php 2010-07-31 20:20:25 UTC (rev 70236) +++ trunk/extensions/WebStore/metadata.php 2010-07-31 21:11:28 UTC (rev 70237) @@ -93,4 +93,3 @@ $obj = new WebStoreMetadata; $obj-executeCommon(); -? Modified: trunk/extensions/WebStore/publish.php === --- trunk/extensions/WebStore/publish.php 2010-07-31 20:20:25 UTC (rev 70236) +++ trunk/extensions/WebStore/publish.php 2010-07-31 21:11:28 UTC (rev 70237) @@ -219,4 +219,3 @@ $w = new WebStorePublish; $w-executeCommon(); -? ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70241] trunk/extensions/PovWatch/PovWatch.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70241
Revision: 70241
Author: platonides
Date: 2010-07-31 21:47:38 + (Sat, 31 Jul 2010)
Log Message:
---
Change to brace syntax.
Modified Paths:
--
trunk/extensions/PovWatch/PovWatch.php
Modified: trunk/extensions/PovWatch/PovWatch.php
===
--- trunk/extensions/PovWatch/PovWatch.php 2010-07-31 21:47:15 UTC (rev
70240)
+++ trunk/extensions/PovWatch/PovWatch.php 2010-07-31 21:47:38 UTC (rev
70241)
@@ -1,5 +1,5 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ):
+if ( !defined( 'MEDIAWIKI' ) ) {
?
html
headtitlePovWatch Version 1.0/title/head
@@ -16,7 +16,7 @@
/html
?php
exit( 1 );
-endif;
+}
$wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70242] trunk/extensions/Farmer/Farmer.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70242 Revision: 70242 Author: platonides Date: 2010-07-31 21:51:37 + (Sat, 31 Jul 2010) Log Message: --- No need to do realpath() to __FILE__ from PHP 4.0.2 Modified Paths: -- trunk/extensions/Farmer/Farmer.php Modified: trunk/extensions/Farmer/Farmer.php === --- trunk/extensions/Farmer/Farmer.php 2010-07-31 21:47:38 UTC (rev 70241) +++ trunk/extensions/Farmer/Farmer.php 2010-07-31 21:51:37 UTC (rev 70242) @@ -25,7 +25,7 @@ */ $wgFarmerSettings = array( // Path to the directory that holds settings for wikis - 'configDirectory' = realpath( dirname( __FILE__ ) ) . '/configs/', + 'configDirectory' = dirname( __FILE__ ) . '/configs/', // Or use a database 'databaseName' = null, ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70244] trunk/extensions/TimedMediaHandler/OggTranscode/ OggTranscodeCron.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70244 Revision: 70244 Author: platonides Date: 2010-07-31 21:57:16 + (Sat, 31 Jul 2010) Log Message: --- Remove ? at end of file. Modified Paths: -- trunk/extensions/TimedMediaHandler/OggTranscode/OggTranscodeCron.php Modified: trunk/extensions/TimedMediaHandler/OggTranscode/OggTranscodeCron.php === --- trunk/extensions/TimedMediaHandler/OggTranscode/OggTranscodeCron.php 2010-07-31 21:53:04 UTC (rev 70243) +++ trunk/extensions/TimedMediaHandler/OggTranscode/OggTranscodeCron.php 2010-07-31 21:57:16 UTC (rev 70244) @@ -321,4 +321,4 @@ $maintClass = OggTranscodeCron; require_once( DO_MAINTENANCE ); -? \ No newline at end of file + ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70245] trunk/extensions
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70245
Revision: 70245
Author: platonides
Date: 2010-07-31 22:08:58 + (Sat, 31 Jul 2010)
Log Message:
---
Change from if (defined()) { code } else { die() } to if (!defined()) { die }
code.
Diffs best ignoring whitespace.
Modified Paths:
--
trunk/extensions/Contributors/Contributors.php
trunk/extensions/ContributorsAddon/ContributorsAddon.php
trunk/extensions/FileSearch/FileSearch.php
trunk/extensions/FormatDates/FormatDates.php
trunk/extensions/Logo/Logo.php
trunk/extensions/RandomImage/RandomImage.php
trunk/extensions/Sort/Sort.php
trunk/extensions/UserRightsNotif/UserRightsNotif.php
Modified: trunk/extensions/Contributors/Contributors.php
===
--- trunk/extensions/Contributors/Contributors.php 2010-07-31 21:57:16 UTC
(rev 70244)
+++ trunk/extensions/Contributors/Contributors.php 2010-07-31 22:08:58 UTC
(rev 70245)
@@ -8,93 +8,91 @@
* @author Rob Church robc...@gmail.com
*/
-if( defined( 'MEDIAWIKI' ) ) {
+if( !defined( 'MEDIAWIKI' ) ) {
+ echo( This file is an extension to the MediaWiki software and cannot
be used standalone.\n );
+ exit( 1 );
+}
- $wgExtensionFunctions[] = 'efContributors';
- $wgExtensionCredits['specialpage'][] = array(
- 'path' = __FILE__,
- 'name' = 'Contributors',
- 'version' = '1.0.1beta',
- 'author' = 'Rob Church',
- 'descriptionmsg' = 'contributors-desc',
- 'url' = 'http://www.mediawiki.org/wiki/Extension:Contributors',
- );
+$wgExtensionFunctions[] = 'efContributors';
+$wgExtensionCredits['specialpage'][] = array(
+ 'path' = __FILE__,
+ 'name' = 'Contributors',
+ 'version' = '1.0.1beta',
+ 'author' = 'Rob Church',
+ 'descriptionmsg' = 'contributors-desc',
+ 'url' = 'http://www.mediawiki.org/wiki/Extension:Contributors',
+);
- $dir = dirname(__FILE__) . '/';
- $wgExtensionMessagesFiles['Contributors'] = $dir .
'Contributors.i18n.php';
- $wgExtensionAliasesFiles['Contributors'] = $dir .
'Contributors.alias.php';
- $wgAutoloadClasses['SpecialContributors'] = $dir .
'Contributors.page.php';
- $wgSpecialPages['Contributors'] = 'SpecialContributors';
- $wgSpecialPageGroups['Contributors'] = 'pages';
+$dir = dirname(__FILE__) . '/';
+$wgExtensionMessagesFiles['Contributors'] = $dir . 'Contributors.i18n.php';
+$wgExtensionAliasesFiles['Contributors'] = $dir . 'Contributors.alias.php';
+$wgAutoloadClasses['SpecialContributors'] = $dir . 'Contributors.page.php';
+$wgSpecialPages['Contributors'] = 'SpecialContributors';
+$wgSpecialPageGroups['Contributors'] = 'pages';
- /**
-* Intelligent cut-off limit; see below
-*/
- $wgContributorsLimit = 10;
+/**
+ * Intelligent cut-off limit; see below
+ */
+$wgContributorsLimit = 10;
- /**
-* After $wgContributorsLimit is reach, contributors with less than this
-* number of edits to a page won't be listed in normal or inclusion
lists
-*/
- $wgContributorsThreshold = 2;
+/**
+ * After $wgContributorsLimit is reach, contributors with less than this
+ * number of edits to a page won't be listed in normal or inclusion lists
+ */
+$wgContributorsThreshold = 2;
- /**
-* Extension initialisation function
-*/
- function efContributors() {
- global $wgHooks;
+/**
+ * Extension initialisation function
+ */
+function efContributors() {
+ global $wgHooks;
- wfLoadExtensionMessages( 'Contributors' );
- $wgHooks['ArticleDeleteComplete'][] =
'efContributorsInvalidateCache';
- $wgHooks['ArticleSaveComplete'][] =
'efContributorsInvalidateCache';
- # Good god, this is ludicrous!
- $wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] =
'efContributorsNavigation';
- $wgHooks['SkinTemplateToolboxEnd'][] = 'efContributorsToolbox';
- }
+ wfLoadExtensionMessages( 'Contributors' );
+ $wgHooks['ArticleDeleteComplete'][] = 'efContributorsInvalidateCache';
+ $wgHooks['ArticleSaveComplete'][] = 'efContributorsInvalidateCache';
+ # Good god, this is ludicrous!
+ $wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] =
'efContributorsNavigation';
+ $wgHooks['SkinTemplateToolboxEnd'][] = 'efContributorsToolbox';
+}
- /**
-* Invalidate the cache we saved for a given title
-*
-* @param $article Article object that changed
-*/
- function efContributorsInvalidateCache( $article ) {
- global $wgMemc;
- $wgMemc-delete( wfMemcKey( 'contributors', $article-getId() )
);
+/**
+ * Invalidate the cache we saved for a given title
+ *
+ * @param $article Article object
[MediaWiki-CVS] SVN: [70246] trunk/extensions/OggHandler/OggHandler_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70246 Revision: 70246 Author: hartman Date: 2010-07-31 22:10:49 + (Sat, 31 Jul 2010) Log Message: --- Correct error in CSS of r66722 Modified Paths: -- trunk/extensions/OggHandler/OggHandler_body.php Modified: trunk/extensions/OggHandler/OggHandler_body.php === --- trunk/extensions/OggHandler/OggHandler_body.php 2010-07-31 22:08:58 UTC (rev 70245) +++ trunk/extensions/OggHandler/OggHandler_body.php 2010-07-31 22:10:49 UTC (rev 70246) @@ -469,6 +469,7 @@ padding: 2pt; text-align: left; font-size: 10pt; +} EOT ) ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70247] trunk/extensions/OggHandler/OggHandler_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70247
Revision: 70247
Author: hartman
Date: 2010-07-31 22:13:08 + (Sat, 31 Jul 2010)
Log Message:
---
Add CSS to fix the indent of the player options ul, which was broken when
rendered with the |center option.
Modified Paths:
--
trunk/extensions/OggHandler/OggHandler_body.php
Modified: trunk/extensions/OggHandler/OggHandler_body.php
===
--- trunk/extensions/OggHandler/OggHandler_body.php 2010-07-31 22:10:49 UTC
(rev 70246)
+++ trunk/extensions/OggHandler/OggHandler_body.php 2010-07-31 22:13:08 UTC
(rev 70247)
@@ -471,6 +471,10 @@
font-size: 10pt;
}
+.center .ogg-player-options ul {
+ margin: 0.3em 0px 0px 1.5em;
+}
+
EOT
) );
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70248] trunk/extensions/Storyboard/api
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70248
Revision: 70248
Author: platonides
Date: 2010-07-31 22:18:32 + (Sat, 31 Jul 2010)
Log Message:
---
Remove require for ApiBase in extension.
Modified Paths:
--
trunk/extensions/Storyboard/api/ApiQueryStories.php
trunk/extensions/Storyboard/api/ApiStoryExists.php
trunk/extensions/Storyboard/api/ApiStoryReview.php
Modified: trunk/extensions/Storyboard/api/ApiQueryStories.php
===
--- trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-07-31 22:13:08 UTC
(rev 70247)
+++ trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-07-31 22:18:32 UTC
(rev 70248)
@@ -24,11 +24,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-if ( !defined( 'MEDIAWIKI' ) ) {
- // Eclipse helper - will be ignored in production
- require_once ( ApiBase.php );
-}
-
/**
* API class for the querieng of stories.
*
@@ -226,4 +221,4 @@
return __CLASS__ . ': $Id$';
}
-}
\ No newline at end of file
+}
Modified: trunk/extensions/Storyboard/api/ApiStoryExists.php
===
--- trunk/extensions/Storyboard/api/ApiStoryExists.php 2010-07-31 22:13:08 UTC
(rev 70247)
+++ trunk/extensions/Storyboard/api/ApiStoryExists.php 2010-07-31 22:18:32 UTC
(rev 70248)
@@ -23,11 +23,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-if ( !defined( 'MEDIAWIKI' ) ) {
- // Eclipse helper - will be ignored in production
- require_once ( ApiBase.php );
-}
-
/**
* This action returns the html for Stories to be displayed in a storyboard.
*
@@ -119,4 +114,4 @@
public function getVersion() {
return __CLASS__ . ': $Id: ApiStoryExists.php 63775 2010-03-15
16:35:22Z jeroendedauw $';
}
-}
\ No newline at end of file
+}
Modified: trunk/extensions/Storyboard/api/ApiStoryReview.php
===
--- trunk/extensions/Storyboard/api/ApiStoryReview.php 2010-07-31 22:13:08 UTC
(rev 70247)
+++ trunk/extensions/Storyboard/api/ApiStoryReview.php 2010-07-31 22:18:32 UTC
(rev 70248)
@@ -23,11 +23,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-if ( !defined( 'MEDIAWIKI' ) ) {
- // Eclipse helper - will be ignored in production
- require_once ( ApiBase.php );
-}
-
/**
* Api class that facilitates story review actions.
*
@@ -167,4 +162,4 @@
public function getVersion() {
return __CLASS__ . ': $Id$';
}
-}
\ No newline at end of file
+}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70249] trunk/extensions/SidebarDonateBox/SidebarDonateBox.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70249
Revision: 70249
Author: reedy
Date: 2010-07-31 22:40:17 + (Sat, 31 Jul 2010)
Log Message:
---
DONATE to donate
Modified Paths:
--
trunk/extensions/SidebarDonateBox/SidebarDonateBox.php
Modified: trunk/extensions/SidebarDonateBox/SidebarDonateBox.php
===
--- trunk/extensions/SidebarDonateBox/SidebarDonateBox.php 2010-07-31
22:18:32 UTC (rev 70248)
+++ trunk/extensions/SidebarDonateBox/SidebarDonateBox.php 2010-07-31
22:40:17 UTC (rev 70249)
@@ -36,7 +36,7 @@
function efSidebarDonateBox( $skin, $bar ) {
global $egSidebarDonateBoxContent;
- $bar['DONATE'] = $egSidebarDonateBoxContent;
+ $bar['donate'] = $egSidebarDonateBoxContent;
return true;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70252] trunk/phase3/includes/api/ApiUpload.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70252
Revision: 70252
Author: platonides
Date: 2010-07-31 23:26:16 + (Sat, 31 Jul 2010)
Log Message:
---
Follow up r70095. Remove the now unused $wgAllowCopyUploads global.
Modified Paths:
--
trunk/phase3/includes/api/ApiUpload.php
Modified: trunk/phase3/includes/api/ApiUpload.php
===
--- trunk/phase3/includes/api/ApiUpload.php 2010-07-31 22:59:57 UTC (rev
70251)
+++ trunk/phase3/includes/api/ApiUpload.php 2010-07-31 23:26:16 UTC (rev
70252)
@@ -38,7 +38,7 @@
}
public function execute() {
- global $wgUser, $wgAllowCopyUploads;
+ global $wgUser;
// Check whether upload is enabled
if ( !UploadBase::isEnabled() ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70253] trunk/tools/code-utils/check-vars.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70253
Revision: 70253
Author: platonides
Date: 2010-07-31 23:36:45 + (Sat, 31 Jul 2010)
Log Message:
---
Commit check-vars.php file. Detects possible errors using MediaWiki conventions
knowledge.
First version was prettier, but did much less things.
Added Paths:
---
trunk/tools/code-utils/check-vars.php
Added: trunk/tools/code-utils/check-vars.php
===
--- trunk/tools/code-utils/check-vars.php (rev 0)
+++ trunk/tools/code-utils/check-vars.php 2010-07-31 23:36:45 UTC (rev
70253)
@@ -0,0 +1,464 @@
+?php
+
+/*
+ * Checks a number of syntax conventions on variables from a valid PHP file.
+ *
+ * Run as:
+ * find phase3/ \( -name \*.php -or -name \*.inc \) -not \( -name
importUseModWiki.php -o -name diffLanguage.php \) -exec php
tools/code-utils/check-vars.php \{\} +
+ */
+
+require_once( dirname( dirname( dirname( __FILE__ ) ) ) .
/phase3/includes/Defines.php ); # Faster than parsing
+require_once( dirname( dirname( dirname( __FILE__ ) ) ) .
/phase3/includes/AutoLoader.php );
+
+if ( !extension_loaded( 'sockets' ) ) dl('sockets.so');
+if ( !extension_loaded( 'PDO' ) ) dl('pdo.so');
+
+$wgAutoloadLocalClasses += array(
+ 'DBAccessError' = 'LBFactory',
+ 'Maintenance' = 'Maintenance.php',
+ 'MessageGroup' = 'Translate extension interface',
+ 'MessageGroups' = 'Translate extension',
+ 'PremadeMediawikiExtensionGroups' = 'Translate extension',
+ 'languages' = 'maintenance/language/languages.inc',
+ 'extensionLanguages' = 'maintenance/language/languages.inc',
+'MessageWriter' =
'maintenance/language/writeMessagesArray.inc',
+ 'tidy' = 'pecl tidy',
+ 'PEAR' = 'pear',
+ 'Normalizer' = 'pecl intl',
+ 'Mail' = 'pear Mail',
+
+ 'UserDupes' = 'maintenance/userDupes.inc',
+ 'DeleteDefaultMessages' =
'maintenance/deleteDefaultMessages.php',
+ 'PopulateCategory' = 'maintenance/populateCategory.php',
+ 'PopulateParentId' = 'maintenance/populateParentId.php',
+ 'PopulateRevisionLength' =
'maintenance/populateRevisionLength.php',
+ 'PopulateLogSearch' = 'maintenance/populateLogSearch.php',
+ 'BaseDump' = 'maintenance/backupPrefetch.inc',
+ 'ExportProgressFilter' = 'maintenance/backup.inc'
+ );
+
+class CheckVars {
+ var $mDebug = false;
+ static $mDefaultSettingsGlobals = null;
+
+ static $constantIgnorePrefixes = array( PGSQL_, OCI_, SQLT_BLOB,
DB2_, XMLREADER_ ); # Ignore constants with these prefixes
+
+ /* Values for status */
+ const WAITING_FUNCTION = 0;
+ const IN_FUNCTION_NAME = 1;
+ const IN_FUNCTION = 2;
+ const IN_GLOBAL = 3;
+ const IN_INTERFACE = 4;
+
+ /* Token specializations */
+ const CLASS_NAME = -4;
+ const CLASS_MEMBER = -5;
+ const FUNCTION_NAME = -6;
+
+ function __construct() {
+ if ( self::$mDefaultSettingsGlobals == null ) {
+ $this-load( dirname( dirname( dirname( __FILE__ ) ) )
. /phase3/includes/DefaultSettings.php, false );
+
+ if ( count( $this-mTokens ) 0 ) {
+ $globals = array (
+ '$wgArticle', #
Setup.php
+
'$wgAutoloadLocalClasses', # AutoLoader.php, a couple of readers
+ '$wgBlobCache',
# HistoryBlob.php
+ '$wgCaches', #
ObjectCache.php
+
'$wgCanonicalNamespaceNames', # Namespace.phph-
+ '$wgContLang',
# Setup.php
+
+
'$wgContLanguageCode', # Should probably be removed
+ '$wgDatabase',
# For update scripts
+
'$wgDBcataloged', #
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/45755#c7954
+
'$wgDeferredUpdateList', # Setup.php
+
'$wgExternalBlobCache', # ExternalStoreDB.php
+
+
'$wgExtModifiedFields', '$wgExtNewFields', '$wgExtNewIndexes',
'$wgExtNewTables', # Updates
+
+
[MediaWiki-CVS] SVN: [70254] trunk/extensions/FlaggedRevs/maintenance/tests
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70254
Revision: 70254
Author: aaron
Date: 2010-08-01 04:37:08 + (Sun, 01 Aug 2010)
Log Message:
---
* r69824: Removed require() that is not needed anymore
* Comment fixes
Modified Paths:
--
trunk/extensions/FlaggedRevs/maintenance/tests/FRInclusionManagerTest.php
trunk/extensions/FlaggedRevs/maintenance/tests/FRUserCountersTest.php
Modified:
trunk/extensions/FlaggedRevs/maintenance/tests/FRInclusionManagerTest.php
===
--- trunk/extensions/FlaggedRevs/maintenance/tests/FRInclusionManagerTest.php
2010-07-31 23:36:45 UTC (rev 70253)
+++ trunk/extensions/FlaggedRevs/maintenance/tests/FRInclusionManagerTest.php
2010-08-01 04:37:08 UTC (rev 70254)
@@ -1,7 +1,5 @@
?php
-require_once 'PHPUnit\Framework\TestCase.php';
-
class FRInclusionManagerTest extends PHPUnit_Framework_TestCase {
/* starting input */
protected static $inputTemplates = array(
@@ -16,7 +14,7 @@
'Filele' = array('ts' = 0, 'sha1' = ''),
'0' = array('ts' = '2203101350', 'sha1' = 'ae33'),
);
- /* output to test against (test# = NS,dbkey,expected rev ID) */
+ /* output to test against (test,NS,dbkey,expected rev ID) */
protected static $reviewedOutputTemplates = array(
array( Output version when given '1224', 10, 'XX', 1242 ),
array( Output version when given '0', 10, 'YY', 0 ),
@@ -35,7 +33,7 @@
array( Output version when given 13, 0, '0', 13 ),
array( Output version when not given, 0, 'NotexistsPage',
0 ),
);
- /* output to test against (test# = dbkey,expected TS,expected sha1)
*/
+ /* output to test against (test,dbkey,expected TS,expected sha1) */
protected static $reviewedOutputFiles = array(
array( Output version when given '20100405192110'/'abc1',
'FileXX', '20100405192110', 'abc1'),
Modified: trunk/extensions/FlaggedRevs/maintenance/tests/FRUserCountersTest.php
===
--- trunk/extensions/FlaggedRevs/maintenance/tests/FRUserCountersTest.php
2010-07-31 23:36:45 UTC (rev 70253)
+++ trunk/extensions/FlaggedRevs/maintenance/tests/FRUserCountersTest.php
2010-08-01 04:37:08 UTC (rev 70254)
@@ -1,7 +1,5 @@
?php
-require_once 'PHPUnit\Framework\TestCase.php';
-
class FRUserCountersTest extends PHPUnit_Framework_TestCase {
/**
* Prepares the environment before running a test.
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70255] branches/MwEmbedStandAlone/modules
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70255
Revision: 70255
Author: dale
Date: 2010-08-01 05:06:36 + (Sun, 01 Aug 2010)
Log Message:
---
more undo redo debug helpers
moved body dom to getter method rather than local variable
Modified Paths:
--
branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilBody.js
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
===
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
2010-08-01 04:37:08 UTC (rev 70254)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
2010-08-01 05:06:36 UTC (rev 70255)
@@ -98,10 +98,11 @@
updateSmilXML: function( smilXML ){
mw.log(Sequencer::updateSmilXML + smilXML);
var _this = this;
- alert( 'before update seq len: ' +
this.getSmil().$dom.find('seq').children().length )
+ alert( 'before Dur:' + this.getEmbedPlayer().getDuration( true
) + ' update seq len: ' + this.getSmil().$dom.find('seq').children().length )
// Update the embedPlayer smil:
this.getSmil().updateFromString( smilXML );
- alert( 'after update seq len: ' +
this.getSmil().$dom.find('seq').children().length )
+ debugger;
+ alert( 'after Dur:' + this.getEmbedPlayer().getDuration( true )
+ ' update seq len: ' + this.getSmil().$dom.find('seq').children().length )
// Get a duration ( forceRefresh to clear the cache )
var dur = this.getEmbedPlayer().getDuration( true );
alert( 'restored dur should be: ' + dur);
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilBody.js
===
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilBody.js
2010-08-01 04:37:08 UTC (rev 70254)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilBody.js
2010-08-01 05:06:36 UTC (rev 70255)
@@ -1,4 +1,4 @@
-/**
+/**
* The smil body also see:
* http://www.w3.org/TR/2008/REC-SMIL3-20081201/smil-structure.html#edef-body
*/
@@ -35,12 +35,15 @@
// Constructor:
init: function( smilObject ){
this.smil = smilObject;
- this.$dom = this.smil.getDom().find( 'body' );
// Assign ids to smil body elements
- this.assignIds( this.$dom );
+ this.assignIds( this.getDom() );
},
+ getDom: function(){
+ return this.smil.getDom().find('body');
+ },
+
/**
* Assigns body smil elements id (for content that has a html
representation ref smilText )
* ( enables fast sync between smilDom and htmlDom )
@@ -52,7 +55,7 @@
){
var idString = _this.getNodeSmilType( $node ) + '_' +
_this.idIndex;
// Make sure the id does not already exist ( should be
a rare case )
- while( this.$dom.find( '#' + idString ).length != 0 ){
+ while( this.getDom().find( '#' + idString ).length != 0
){
_this.idIndex++;
idString = _this.getNodeSmilType( $node ) + '_'
+ _this.idIndex;
}
@@ -161,7 +164,7 @@
return smallIndex = i;
}
// Build an audio timeline starting from the top level node:
- this.getRefElementsRecurse( this.$dom, 0, function( $node ){
+ this.getRefElementsRecurse( this.getDom(), 0, function( $node ){
var nodeType = _this.smil.getRefType( $node ) ;
// Check if the node is audio ( first in wins / audio
wins over video)
if( nodeType == 'audio' || nodeType == 'video' ) {
@@ -237,7 +240,7 @@
time =0;
}
// Recurse on every ref element and run relevant callbacks
- this.getRefElementsRecurse( this.$dom, 0, function( $node ){
+ this.getRefElementsRecurse( this.getDom(), 0, function( $node ){
var startOffset = $node.data( 'startOffset' );
var nodeDuration = _this.getClipDuration( $node );
@@ -260,7 +263,7 @@
*/
getSeqElements: function( $node ){
if( ! $node ){
- $node = this.$dom;
+ $node = this.getDom();
}
return $node.find('seq');
},
@@ -321,7 +324,7 @@
* ( wraps getDurationRecurse to get top level node duration )
*/
getDuration: function( forceRefresh ){
