jenkins-bot has submitted this change and it was merged.
Change subject: Update find-entries.php to 2013
......................................................................
Update find-entries.php to 2013
* Add support for __DIR__ (added in PHP 5.3)
* Support RUN_MAINTENANCE_IF_MAIN define,
renamed from DO_MAINTENANCE in r80205 (26505b17)
Change-Id: I9620ac6371fc2e9016e5d4d97c3c65c2ff4faa75
---
M find-entries.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/find-entries.php b/find-entries.php
index 86a42fa..52aba83 100755
--- a/find-entries.php
+++ b/find-entries.php
@@ -57,10 +57,14 @@
do { $i++; } while ( $tokens[$i][0] == T_WHITESPACE );
if ( $tokens[$i] != '.' ) return false;
do { $i++; } while ( $tokens[$i][0] == T_WHITESPACE );
+ } elseif ( $tokens[$i][0] == T_DIR ) {
+ do { $i++; } while ( $tokens[$i][0] == T_WHITESPACE );
+ if ( $tokens[$i] != '.' ) return false;
+ do { $i++; } while ( $tokens[$i][0] == T_WHITESPACE );
}
$filetoken = $tokens[$i];
- if ( ( $filetoken[0] == T_STRING ) && ( $filetoken[1] ==
'DO_MAINTENANCE' ) ) {
+ if ( ( $filetoken[0] == T_STRING ) && ( $filetoken[1] ==
'DO_MAINTENANCE' || $filetoken[1] == 'RUN_MAINTENANCE_IF_MAIN' ) ) {
// Hack for MediaWiki maintenance
if ( substr( $lastFilename, -15 ) == 'Maintenance.php' ) {
$filetoken[1] = "'" . str_replace( 'Maintenance.php',
'doMaintenance.php', $lastFilename ) . "'"; # It will be treated as clean for
the wrong way, but the final result is right.
--
To view, visit https://gerrit.wikimedia.org/r/49230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9620ac6371fc2e9016e5d4d97c3c65c2ff4faa75
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/code-utils
Gerrit-Branch: master
Gerrit-Owner: Platonides <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
