Index: trunk/phase3/CREDITS |
— | — | @@ -61,6 +61,7 @@ |
62 | 62 | * Brent G |
63 | 63 | * Brianna Laugher |
64 | 64 | * Carlin |
| 65 | +* Chris Wrinn |
65 | 66 | * church of emacs |
66 | 67 | * Daniel Arnold |
67 | 68 | * Danny B. |
Index: trunk/phase3/api.php |
— | — | @@ -51,10 +51,10 @@ |
52 | 52 | // |
53 | 53 | // Ensure that all access is through the canonical entry point... |
54 | 54 | // |
55 | | -if( isset( $_SERVER['SCRIPT_URL'] ) ) { |
56 | | - $url = $_SERVER['SCRIPT_URL']; |
| 55 | +if( isset( $_SERVER['SCRIPT_NAME'] ) ) { |
| 56 | + $url = $_SERVER['SCRIPT_NAME']; |
57 | 57 | } else { |
58 | | - $url = $_SERVER['PHP_SELF']; |
| 58 | + $url = $_SERVER['URL']; |
59 | 59 | } |
60 | 60 | if( strcmp( "$wgScriptPath/api$wgScriptExtension", $url ) ) { |
61 | 61 | wfHttpError( 403, 'Forbidden', |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -425,6 +425,7 @@ |
426 | 426 | * (bug 18546) Added timestamp of new revision to action=edit output |
427 | 427 | * (bug 18554) Also list hidden revisions in list=usercontribs for privileged |
428 | 428 | users |
| 429 | +* (bug 13049) "API must be accessed from the primary script entry point" error |
429 | 430 | |
430 | 431 | === Languages updated in 1.15 === |
431 | 432 | |