[ros-diffs] [cfinck] 32872: - Prepend $IP, when including RosCMS files, so we always have the correct directory path - Comment out the settings for locally testing the Wiki in "LocalSettings.php", I accidentally enabled them

Author: cfinck
Date: Sat Apr  5 08:08:30 2008
New Revision: 32872

URL: http://svn.reactos.org/svn/reactos?rev=32872&view=rev
Log:
- Prepend $IP, when including RosCMS files, so we always have the correct directory path
- Comment out the settings for locally testing the Wiki in "LocalSettings.php", I accidentally enabled them

Modified:
    trunk/web/reactos.org/htdocs/wiki/LocalSettings.php
    trunk/web/reactos.org/htdocs/wiki/includes/SpecialUserlogin.php
    trunk/web/reactos.org/htdocs/wiki/includes/User.php

Modified: trunk/web/reactos.org/htdocs/wiki/LocalSettings.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/LocalSe...
==============================================================================
--- trunk/web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] (original)
+++ trunk/web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] Sat Apr  5 08:08:30 2008
@@ -67,14 +67,17 @@
 $wgEnotifWatchlist = true; # UPO
 $wgEmailAuthentication = false;

-//require_once("/web/reactos.org/config/wiki-connect.php");
-$wgDBserver         = "localhost";
+// For the server
+require_once("/web/reactos.org/config/wiki-connect.php");
+
+// For local testing
+/*$wgDBserver         = "localhost";
 $wgDBname           = "roswiki";
 $wgDBuser           = "rosuser";
 $wgDBpassword       = "roscms";
 $wgDBprefix         = "";
 $wgDBtype           = "mysql";
-$wgDBport           = "5432";
+$wgDBport           = "5432";*/

# Experimental charset support for MySQL 4.1/5.0.
 $wgDBmysql5 = false;

Modified: trunk/web/reactos.org/htdocs/wiki/includes/SpecialUserlogin.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/include...
==============================================================================
--- trunk/web/reactos.org/htdocs/wiki/includes/SpecialUserlogin.php [iso-8859-1] (original)
+++ trunk/web/reactos.org/htdocs/wiki/includes/SpecialUserlogin.php [iso-8859-1] Sat Apr  5 08:08:30 2008
@@ -4,7 +4,7 @@
  * @addtogroup SpecialPage
  */

-require_once( '../roscms/inc/subsys_login.php' );
+require_once("$IP/../roscms/inc/subsys_login.php");

/**
  * constructor

Modified: trunk/web/reactos.org/htdocs/wiki/includes/User.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/include...
==============================================================================
--- trunk/web/reactos.org/htdocs/wiki/includes/User.php [iso-8859-1] (original)
+++ trunk/web/reactos.org/htdocs/wiki/includes/User.php [iso-8859-1] Sat Apr  5 08:08:30 2008
@@ -4,7 +4,7 @@
  *
  */

-require_once( "../roscms/inc/subsys_login.php" );
+require_once("$IP/../roscms/inc/subsys_login.php");

# Number of characters in user_token field
 define( 'USER_TOKEN_LENGTH', 32 );