Skip to content
Snippets Groups Projects
Commit 0f4654c2 authored by Tim Steiner's avatar Tim Steiner
Browse files

[gh-492] Upgrade drupal to 7.16

parent d8c5a9e1
Branches
Tags
No related merge requests found
Showing
with 68 additions and 55 deletions
......@@ -5,8 +5,8 @@ package = Core
core = 7.x
files[] = openid.test
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -180,6 +180,15 @@ class OpenIDFunctionalTestCase extends OpenIDWebTestCase {
// Verify user was redirected away from user/login to an accessible page.
$this->assertResponse(200);
$this->drupalLogout();
// Use a User-supplied Identity that is the URL of an XRDS document.
// Tell the test module to add a doctype. This should fail.
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE, 'query' => array('doctype' => 1)));
// Test logging in via the login block on the front page.
$edit = array('openid_identifier' => $identity);
$this->drupalPost('', $edit, t('Log in'));
$this->assertRaw(t('Sorry, that is not a valid OpenID. Ensure you have spelled your ID correctly.'), 'XML with DOCTYPE was rejected.');
}
/**
......
......@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = openid
hidden = TRUE
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -109,7 +109,11 @@ function openid_test_yadis_xrds() {
}
}
drupal_add_http_header('Content-Type', 'application/xrds+xml');
print '<?xml version="1.0" encoding="UTF-8"?>
print '<?xml version="1.0" encoding="UTF-8"?>';
if (!empty($_GET['doctype'])) {
print "\n<!DOCTYPE dct [ <!ELEMENT blue (#PCDATA)> ]>\n";
}
print '
<xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)" xmlns:openid="http://openid.net/xmlns/1.0">
<XRD>
<Status cid="' . check_plain(variable_get('openid_test_canonical_id_status', 'verified')) . '"/>
......
......@@ -4,8 +4,8 @@ package = Core
version = VERSION
core = 7.x
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -6,8 +6,8 @@ core = 7.x
files[] = path.test
configure = admin/config/search/path
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
files[] = php.test
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -6,8 +6,8 @@ core = 7.x
files[] = poll.test
stylesheets[all][] = poll.css
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -11,8 +11,8 @@ configure = admin/config/people/profile
; See user_system_info_alter().
hidden = TRUE
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
files[] = rdf.test
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -8,8 +8,8 @@ files[] = search.test
configure = admin/config/search/settings
stylesheets[all][] = search.css
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -6,8 +6,8 @@ core = 7.x
files[] = shortcut.test
configure = admin/config/user-interface/shortcut
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -54,8 +54,8 @@ files[] = tests/upgrade/upgrade.upload.test
files[] = tests/upgrade/update.user.test
files[] = tests/upgrade/upgrade.user.test
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -5,8 +5,8 @@ package = Testing
version = VERSION
hidden = TRUE
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
......@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
hidden = TRUE
; Information added by drupal.org packaging script on 2012-08-01
version = "7.15"
; Information added by drupal.org packaging script on 2012-10-17
version = "7.16"
project = "drupal"
datestamp = "1343839327"
datestamp = "1350508567"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment