Revert r24574 and r24667 per Brion on bug 10798

[lhc/web/wiklou.git] / profileinfo.php
diff --git a/profileinfo.php b/profileinfo.php

index 1c603b6..4e2a3d7 100644 (file)
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -21,7 +21,6 @@
       OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
       SOFTWARE.
  
-     $Id$
  -->
  <html>
  <head>
@@ -47,18 +46,21 @@
  
  $wgDBadminuser = $wgDBadminpassword = $wgDBserver = $wgDBname = $wgEnableProfileInfo = false;
  
-define("MEDIAWIKI", 1);
-
-require_once("./includes/Defines.php");
-require_once("./LocalSettings.php");
+define( 'MW_NO_SETUP', 1 );
+require_once( './includes/WebStart.php' );
  require_once("./AdminSettings.php");
  
-if (!$wgEnableProfileInfo)
-       die("disabled");
+if (!$wgEnableProfileInfo) {
+       echo "disabled\n";
+       exit( 1 );
+}
  
  foreach (array("wgDBadminuser", "wgDBadminpassword", "wgDBserver", "wgDBname") as $var)
-       if ($$var === false)
-               die("AdminSettings.php not correct");
+       if ($$var === false) {
+               echo "AdminSettings.php not correct\n";
+               exit( 1 );
+       }
+
  
  $expand = array();
  if (isset($_REQUEST['expand']))