https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113368
Revision: 113368
Author: reedy
Date: 2012-03-08 16:34:38 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
MFT r113367
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/ExtensionDistributor/ExtensionDistributor_body.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/
branches/wmf/1.19wmf1/extensions/ExtensionDistributor/
Property changes on: branches/wmf/1.19wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:110933,111011,111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628,112751,112758,112770-112772,112775,112849,112851,112856,112859,112903,112925,112993
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:110933,111011,111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628,112751,112758,112770-112772,112775,112849,112851,112856,112859,112903,112925,112993,113367
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Property changes on: branches/wmf/1.19wmf1/extensions/ExtensionDistributor
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wmf/1.18wmf1/extensions/ExtensionDistributor:102499,102502
+ /branches/wmf/1.18wmf1/extensions/ExtensionDistributor:102499,102502
/trunk/extensions/ExtensionDistributor:113367
Modified:
branches/wmf/1.19wmf1/extensions/ExtensionDistributor/ExtensionDistributor_body.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ExtensionDistributor/ExtensionDistributor_body.php
2012-03-08 16:33:04 UTC (rev 113367)
+++
branches/wmf/1.19wmf1/extensions/ExtensionDistributor/ExtensionDistributor_body.php
2012-03-08 16:34:38 UTC (rev 113368)
@@ -227,9 +227,12 @@
// Does the tar file need ExtensionFunctions.php?
$dir =
"$wgExtDistWorkingCopy/$version/extensions/$extension";
$retval = - 1;
- $files = call_user_func_array( 'wfEscapeShellArg',
glob( "$dir/*.php" ) );
- wfShellExec( "grep -q '\bExtensionFunctions' " .
$files, $retval );
- $needEF = !$retval;
+ $needEF = false;
+ if ( file_exists( 'ExtensionFunctions.php' ) ) {
+ $files = call_user_func_array(
'wfEscapeShellArg', glob( "$dir/*.php" ) );
+ wfShellExec( "grep -q '\bExtensionFunctions' "
. $files, $retval );
+ $needEF = !$retval;
+ }
// Create the archive.
$cmd = 'tar -czf ' . wfEscapeShellArg( $tarFile ) .
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
