* Correction for API path fix, broken in 1.9.5origin/REL1_9

bump to 1.9.6

3 files changed, 9 insertions, 2 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a68b1e89322a..5225384168f9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,13 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+== MediaWiki 1.9.6 ==
+
+March 2, 2008
+
+* Correction for API path fix, broken in 1.9.5
+
+
 == MediaWiki 1.9.5 ==
 
 January 23, 2008
diff --git a/api.php b/api.php
index 35616a517e09..92318cb3ca7e 100644
--- a/api.php
+++ b/api.php
@@ -44,7 +44,7 @@ if( isset( $_SERVER['SCRIPT_URL'] ) ) {
 } else {
 	$url = $_SERVER['PHP_SELF'];
 }
-if( strcmp( "$wgScriptPath/api$wgScriptExtension", $url ) ) {
+if( strcmp( "$wgScriptPath/api.php", $url ) ) {
 	wfHttpError( 403, 'Forbidden',
 		'API must be accessed through the primary script entry point.' );
 	return;
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index af66e720cd88..7550ec1f1015 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -32,7 +32,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.9.5';
+$wgVersion			= '1.9.6';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';