* (bug 6892, 7147) Trackback error handling, optional fields more robust

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 88dbb75..95af539 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -121,6 +121,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12294) Namespace class renamed to MWNamespace for PHP 5.3 compatibility
 * PHP 5.3 compatibility fix for wfRunHooks() called with no parameters
 * (bug 6447) Trackbacks now work with transactional tables, if enabled
+* (bug 6892, 7147) Trackback error handling, optional fields more robust
 
 
 === API changes in 1.13 ===

diff --git a/trackback.php b/trackback.php
index 3985030..90a22e4 100644 (file)
--- a/trackback.php
+++ b/trackback.php
@@ -35,17 +35,16 @@ if (!$wgUseTrackbacks)
        XMLerror("Trackbacks are disabled.");
 
 if (   !isset($_POST['url'])
-    || !isset($_POST['blog_name'])
     || !isset($_REQUEST['article']))
        XMLerror("Required field not specified");
 
 $dbw = wfGetDB(DB_MASTER);
 
-$tbtitle = $_POST['title'];
-$tbex = $_POST['excerpt'];
-$tburl = $_POST['url'];
-$tbname = $_POST['blog_name'];
-$tbarticle = $_REQUEST['article'];
+$tbtitle = strval( @$_POST['title'] );
+$tbex = strval( @$_POST['excerpt'] );
+$tburl = strval( $_POST['url'] );
+$tbname = strval( @$_POST['blog_name'] );
+$tbarticle = strval( $_REQUEST['article'] );
 
 $title = Title::newFromText($tbarticle);
 if (!isset($title) || !$title->exists())