From: Daniel Kinzler <daniel@users.mediawiki.org>
Date: Wed, 9 Jul 2008 15:05:25 +0000 (+0000)
Subject: improved integration into category bar. Note:  options is not functional until SkinJo... 
X-Git-Tag: 1.31.0-rc.0~46606
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=438f6d2925fe3c615467e743bbbbde5de6b9a76a;p=lhc%2Fweb%2Fwiklou.git

improved integration into category bar. Note:  options is not functional until SkinJoinCategoryLinks hook is implemented (merge pending)
---

diff --git a/StartProfiler.php b/StartProfiler.php
index 3fcf69e6e5..2a351677b7 100644
--- a/StartProfiler.php
+++ b/StartProfiler.php
@@ -1,6 +1,9 @@
 <?php
 
-require_once( dirname(__FILE__).'/includes/ProfilerStub.php' );
+#require_once( dirname(__FILE__).'/includes/ProfilerStub.php' );
+
+ require_once(  dirname(__FILE__).'/includes/Profiler.php' );
+ $wgProfiler = new Profiler;
 
 /**
  * To use a profiler, delete the line above and add something like this:
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 89753f2a54..0066a71192 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -193,6 +193,7 @@ class UserMailer {
 					}
 				} else {
 					$sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers );
+					print "RESULT: $sent.";
 				}
 			} else {
 				$wgErrorString = 'PHP is not configured to send mail';
@@ -222,7 +223,7 @@ class UserMailer {
 	 */
 	static function errorHandler( $code, $string ) {
 		global $wgErrorString;
-		$wgErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
+		$wgErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string . "XXXXXXXXXXXXXXXXXX");
 	}
 
 	/**