Revision: 51663
Author:   demon
Date:     2009-06-09 21:50:40 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------
* Nuke Version.php, not needed for a 1-line variable declaration
* Use Http::userAgent() so we're consistent with the core UA, even though it 
probably won't change.

Modified Paths:
--------------
    trunk/extensions/Collection/Collection.body.php
    trunk/extensions/Collection/Collection.php

Removed Paths:
-------------
    trunk/extensions/Collection/Version.php

Modified: trunk/extensions/Collection/Collection.body.php
===================================================================
--- trunk/extensions/Collection/Collection.body.php     2009-06-09 20:52:31 UTC 
(rev 51662)
+++ trunk/extensions/Collection/Collection.body.php     2009-06-09 21:50:40 UTC 
(rev 51663)
@@ -973,7 +973,7 @@
                curl_setopt($c, CURLOPT_PROXY, $wgHTTPProxy);
                $userAgent = wfGetAgent();
                if ( !$userAgent ) $userAgent = "Unknown user agent";
-               curl_setopt( $c, CURLOPT_USERAGENT, $userAgent . " (via 
MediaWiki/$wgVersion, Collection/$wgCollectionVersion)" );
+               curl_setopt( $c, CURLOPT_USERAGENT, $userAgent . " (via " . 
Http::userAgent() . ", Collection/$wgCollectionVersion)" );
                curl_setopt( $c, CURLOPT_POST, true );
                curl_setopt( $c, CURLOPT_POSTFIELDS, $postFields );
                curl_setopt( $c, CURLOPT_HTTPHEADER, array( 'Expect:' ) );

Modified: trunk/extensions/Collection/Collection.php
===================================================================
--- trunk/extensions/Collection/Collection.php  2009-06-09 20:52:31 UTC (rev 
51662)
+++ trunk/extensions/Collection/Collection.php  2009-06-09 21:50:40 UTC (rev 
51663)
@@ -32,7 +32,8 @@
 
 $dir = dirname(__FILE__) . '/';
 
-require_once( $dir . 'Version.php' );
+# Extension version
+$wgCollectionVersion = "1.2";
 
 # 
==============================================================================
 

Deleted: trunk/extensions/Collection/Version.php
===================================================================
--- trunk/extensions/Collection/Version.php     2009-06-09 20:52:31 UTC (rev 
51662)
+++ trunk/extensions/Collection/Version.php     2009-06-09 21:50:40 UTC (rev 
51663)
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * Collection Extension for MediaWiki
- *
- * Copyright (C) 2008, PediaPress GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-$wgCollectionVersion = "1.2";



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to