http://www.mediawiki.org/wiki/Special:Code/MediaWiki/54926
Revision: 54926
Author: werdna
Date: 2009-08-13 10:46:28 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
Update HoneypotIntegration extension to r54925
Modified Paths:
--------------
branches/wmf-deployment/extensions/HoneypotIntegration/HoneypotIntegration.class.php
branches/wmf-deployment/extensions/HoneypotIntegration/loadHoneypotData.php
Property Changed:
----------------
branches/wmf-deployment/extensions/HoneypotIntegration/
Property changes on: branches/wmf-deployment/extensions/HoneypotIntegration
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646
/trunk/extensions/HoneypotIntegration:52089-54923
/trunk/phase3/HoneypotIntegration:52859,53272
/trunk/phase3/extensions/HoneypotIntegration:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
+ /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646
/trunk/extensions/HoneypotIntegration:52089-54925
/trunk/phase3/HoneypotIntegration:52859,53272
/trunk/phase3/extensions/HoneypotIntegration:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
Modified:
branches/wmf-deployment/extensions/HoneypotIntegration/HoneypotIntegration.class.php
===================================================================
---
branches/wmf-deployment/extensions/HoneypotIntegration/HoneypotIntegration.class.php
2009-08-13 10:45:27 UTC (rev 54925)
+++
branches/wmf-deployment/extensions/HoneypotIntegration/HoneypotIntegration.class.php
2009-08-13 10:46:28 UTC (rev 54926)
@@ -48,6 +48,12 @@
if (!$wgHoneypotAutoLoad)
return array( 'http://www.google.com' ); // Dummy URL
+ return self::loadHoneypotURLs();
+ }
+
+ public static function loadHoneypotURLs() {
+ $key = wfMemcKey( 'honeypot-integration-urls' );
+
global $wgHoneypotURLSource;
// Curl opt is a hack because the honeypot folks don't seem to
have a valid
// certificate.
@@ -58,7 +64,7 @@
$wgMemc->set( $key, $urls, 86400 );
- return $urls;
+ return $urls;
}
public static function generateHoneypotLink( $randomText = null ) {
Modified:
branches/wmf-deployment/extensions/HoneypotIntegration/loadHoneypotData.php
===================================================================
--- branches/wmf-deployment/extensions/HoneypotIntegration/loadHoneypotData.php
2009-08-13 10:45:27 UTC (rev 54925)
+++ branches/wmf-deployment/extensions/HoneypotIntegration/loadHoneypotData.php
2009-08-13 10:46:28 UTC (rev 54926)
@@ -8,3 +8,4 @@
: dirname( __FILE__ ) . '/../../maintenance/commandLine.inc' );
HoneypotIntegration::loadHoneypotData();
+HoneypotIntegration::loadHoneypotURLs();
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
