r64994 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r64993‎ | r64994 | r64995 >
Date:17:01, 13 April 2010
Author:yaron
Status:deferred
Tags:
Comment:
Merging in the file includes/DT_Settings.php into DataTransfer.php
Modified paths:
  • /trunk/extensions/DataTransfer/DataTransfer.php (modified) (history)
  • /trunk/extensions/DataTransfer/includes/DT_Settings.php (deleted) (history)

Diff [purge]

Index: trunk/extensions/DataTransfer/DataTransfer.php
@@ -22,7 +22,13 @@
2323 'descriptionmsg' => 'dt-desc',
2424 );
2525
26 -$dtgIP = $IP . '/extensions/DataTransfer';
 26+###
 27+# This is the path to your installation of Semantic Forms as
 28+# seen on your local filesystem. Used against some PHP file path
 29+# issues.
 30+##
 31+$dtgIP = dirname( __FILE__ );
 32+##
2733
2834 // register all special pages and other classes
2935 $wgSpecialPages['ViewXML'] = 'DTViewXML';
@@ -37,7 +43,25 @@
3844 $wgHooks['AdminLinks'][] = 'dtfAddToAdminLinks';
3945 $wgHooks['smwInitProperties'][] = 'dtfInitProperties';
4046
41 -require_once( $dtgIP . '/languages/DT_Language.php' );
 47+###
 48+# This is the path to your installation of the Data Transfer extension as
 49+# seen from the web. Change it if required ($wgScriptPath is the
 50+# path to the base directory of your wiki). No final slash.
 51+##
 52+$dtgScriptPath = $wgScriptPath . '/extensions/DataTransfer';
 53+##
 54+
 55+###
 56+# Permission to import files
 57+###
 58+$wgGroupPermissions['sysop']['datatransferimport'] = true;
 59+$wgAvailableRights[] = 'datatransferimport';
 60+
 61+// initialize content language
 62+require_once($dtgIP . '/languages/DT_Language.php');
 63+global $wgLanguageCode;
 64+dtfInitContentLanguage($wgLanguageCode);
 65+
4266 $wgExtensionMessagesFiles['DataTransfer'] = $dtgIP . '/languages/DT_Messages.php';
4367 $wgExtensionAliasesFiles['DataTransfer'] = $dtgIP . '/languages/DT_Aliases.php';
4468
Index: trunk/extensions/DataTransfer/includes/DT_Settings.php
@@ -1,30 +0,0 @@
2 -<?php
3 -
4 -# ##
5 -# This is the path to your installation of the Data Transfer extension as
6 -# seen from the web. Change it if required ($wgScriptPath is the
7 -# path to the base directory of your wiki). No final slash.
8 -# #
9 -$dtgScriptPath = $wgScriptPath . '/extensions/DataTransfer';
10 -# #
11 -
12 -# ##
13 -# This is the path to your installation of Data Transfer as
14 -# seen on your local filesystem. Used against some PHP file path
15 -# issues.
16 -# #
17 -$dtgIP = $IP . '/extensions/DataTransfer';
18 -# #
19 -
20 -# ##
21 -# Permission to import files
22 -# ##
23 -$wgGroupPermissions['sysop']['datatransferimport'] = true;
24 -$wgAvailableRights[] = 'datatransferimport';
25 -
26 -// load global functions
27 -require_once( 'DT_GlobalFunctions.php' );
28 -
29 -// initialize content language
30 -global $wgLanguageCode;
31 -dtfInitContentLanguage( $wgLanguageCode );

Status & tagging log