diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 107ca9a..ff49c3f 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -719,7 +719,7 @@ function drupal_settings_initialize() { global $base_url, $base_path, $base_root, $script_path; // Export these settings.php variables to the global namespace. - global $databases, $cookie_domain, $conf, $installed_profile, $update_free_access, $class_loader, $db_url, $db_prefix, $drupal_hash_salt, $is_https, $base_secure_url, $base_insecure_url, $config_directories; + global $databases, $cookie_domain, $conf, $settings, $installed_profile, $update_free_access, $db_url, $db_prefix, $drupal_hash_salt, $is_https, $base_secure_url, $base_insecure_url, $config_directories; $conf = array(); // Make conf_path() available as local variable in settings.php. @@ -3012,12 +3012,11 @@ function drupal_classloader() { static $loader; if (!isset($loader)) { - global $class_loader; // Include the Symfony ClassLoader for loading PSR-0-compatible classes. require_once DRUPAL_ROOT . '/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/UniversalClassLoader.php'; - switch ($class_loader) { + switch ($GLOBALS['settings']['class_loader']) { case 'apc': if (function_exists('apc_store')) { require_once DRUPAL_ROOT . '/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php'; diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollBlockTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollBlockTest.php deleted file mode 100644 index 3febde0..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollBlockTest.php +++ /dev/null @@ -1,89 +0,0 @@ - 'Block availability', - 'description' => 'Check if the most recent poll block is available.', - 'group' => 'Poll', - ); - } - - function setUp() { - parent::setUp(); - - // Create and login user - $admin_user = $this->drupalCreateUser(array('administer blocks')); - $this->drupalLogin($admin_user); - } - - /** - * Tests creating, viewing, voting on recent poll block. - */ - function testRecentBlock() { - // Set block title to confirm that the interface is available. - $this->drupalPost('admin/structure/block/manage/poll/recent/configure', array('title' => $this->randomName(8)), t('Save block')); - $this->assertText(t('The block configuration has been saved.'), 'Block configuration set.'); - - // Set the block to a region to confirm block is available. - $edit = array(); - $edit['blocks[poll_recent][region]'] = 'footer'; - $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); - $this->assertText(t('The block settings have been updated.'), 'Block successfully move to footer region.'); - - // Create a poll which should appear in recent polls block. - $title = $this->randomName(); - $choices = $this->_generateChoices(7); - $poll_nid = $this->pollCreate($title, $choices, TRUE); - - // Verify poll appears in a block. - // View user page so we're not matching the poll node on front page. - $this->drupalGet('user'); - // If a 'block' view not generated, this title would not appear even though - // the choices might. - $this->assertText($title, 'Poll appears in block.'); - - // Logout and login back in as a user who can vote. - $this->drupalLogout(); - $vote_user = $this->drupalCreateUser(array('cancel own vote', 'inspect all votes', 'vote on polls', 'access content')); - $this->drupalLogin($vote_user); - - // Verify we can vote via the block. - $edit = array( - 'choice' => '1', - ); - $this->drupalPost('user/' . $vote_user->uid, $edit, t('Vote')); - $this->assertText('Your vote was recorded.', 'Your vote was recorded.'); - $this->assertText('Total votes: 1', 'Vote count updated correctly.'); - $this->assertText('Older polls', 'Link to older polls appears.'); - $this->clickLink('Older polls'); - $this->assertText('1 vote - open', 'Link to poll listing correct.'); - - // Close the poll and verify block doesn't appear. - $content_user = $this->drupalCreateUser(array('create poll content', 'edit any poll content', 'access content')); - $this->drupalLogout(); - $this->drupalLogin($content_user); - $close_edit = array('active' => 0); - $this->pollUpdate($poll_nid, $title, $close_edit); - $this->drupalGet('user/' . $content_user->uid); - $this->assertNoText($title, 'Poll no longer appears in block.'); - } -} diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollCreateTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollCreateTest.php deleted file mode 100644 index 0618ce1..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollCreateTest.php +++ /dev/null @@ -1,119 +0,0 @@ - 'Poll create', - 'description' => 'Adds "more choices", previews and creates a poll.', - 'group' => 'Poll' - ); - } - - /** - * Tests creating, listing, editing a new poll. - */ - function testPollCreate() { - $title = $this->randomName(); - $choices = $this->_generateChoices(7); - $poll_nid = $this->pollCreate($title, $choices, TRUE); - - // Verify poll appears on 'poll' page. - $this->drupalGet('poll'); - $this->assertText($title, 'Poll appears in poll list.'); - $this->assertText('open', 'Poll is active.'); - - // Click on the poll title to go to node page. - $this->clickLink($title); - $this->assertText('Total votes: 0', 'Link to poll correct.'); - - // Now add a new option to make sure that when we update the node the - // option is displayed. - $node = node_load($poll_nid); - - $new_option = $this->randomName(); - - $vote_count = '2000'; - $node->choice[] = array( - 'chid' => '', - 'chtext' => $new_option, - 'chvotes' => (int) $vote_count, - 'weight' => 1000, - ); - - $node->save(); - - $this->drupalGet('poll'); - $this->clickLink($title); - $this->assertText($new_option, 'New option found.'); - - $option = $this->xpath('//article[@id="node-1"]//div[@class="poll"]//dt[@class="choice-title"]'); - $this->assertEqual(end($option), $new_option, 'Last item is equal to new option.'); - - $votes = $this->xpath('//article[@id="node-1"]//div[@class="poll"]//div[@class="percent"]'); - $this->assertTrue(strpos(end($votes), $vote_count) > 0, "Votes saved."); - } - - /** - * Tests creating, editing, and closing a poll. - */ - function testPollClose() { - $content_user = $this->drupalCreateUser(array('create poll content', 'edit any poll content', 'access content')); - $vote_user = $this->drupalCreateUser(array('cancel own vote', 'inspect all votes', 'vote on polls', 'access content')); - - // Create poll. - $title = $this->randomName(); - $choices = $this->_generateChoices(7); - $poll_nid = $this->pollCreate($title, $choices, FALSE); - - $this->drupalLogout(); - $this->drupalLogin($content_user); - - // Edit the poll node and close the poll. - $close_edit = array('active' => 0); - $this->pollUpdate($poll_nid, $title, $close_edit); - - // Verify 'Vote' button no longer appears. - $this->drupalGet('node/' . $poll_nid); - $elements = $this->xpath('//input[@id="edit-vote"]'); - $this->assertTrue(empty($elements), "Vote button doesn't appear."); - - // Verify status on 'poll' page is 'closed'. - $this->drupalGet('poll'); - $this->assertText($title, 'Poll appears in poll list.'); - $this->assertText('closed', 'Poll is closed.'); - - // Edit the poll node and re-activate. - $open_edit = array('active' => 1); - $this->pollUpdate($poll_nid, $title, $open_edit); - - // Vote on the poll. - $this->drupalLogout(); - $this->drupalLogin($vote_user); - $vote_edit = array('choice' => '1'); - $this->drupalPost('node/' . $poll_nid, $vote_edit, t('Vote')); - $this->assertText('Your vote was recorded.', 'Your vote was recorded.'); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(isset($elements[0]), "'Cancel your vote' button appears."); - - // Edit the poll node and close the poll. - $this->drupalLogout(); - $this->drupalLogin($content_user); - $close_edit = array('active' => 0); - $this->pollUpdate($poll_nid, $title, $close_edit); - - // Verify 'Cancel your vote' button no longer appears. - $this->drupalGet('node/' . $poll_nid); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(empty($elements), "'Cancel your vote' button no longer appears."); - } -} diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollDeleteChoiceTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollDeleteChoiceTest.php deleted file mode 100644 index ccbd044..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollDeleteChoiceTest.php +++ /dev/null @@ -1,46 +0,0 @@ - 'Poll choice deletion', - 'description' => 'Test the poll choice deletion logic.', - 'group' => 'Poll', - ); - } - - /** - * Tests removing a choice from a poll. - */ - function testChoiceRemoval() { - // Set up a poll with three choices. - $title = $this->randomName(); - $choices = array('First choice', 'Second choice', 'Third choice'); - $poll_nid = $this->pollCreate($title, $choices, FALSE); - $this->assertTrue($poll_nid, 'Poll for choice deletion logic test created.'); - - // Edit the poll, and try to delete first poll choice. - $this->drupalGet("node/$poll_nid/edit"); - $edit['choice[chid:1][chtext]'] = ''; - $this->drupalPost(NULL, $edit, t('Save')); - - // Click on the poll title to go to node page. - $this->drupalGet('poll'); - $this->clickLink($title); - - // Check the first poll choice is deleted, while the others remain. - $this->assertNoText('First choice', 'First choice removed.'); - $this->assertText('Second choice', 'Second choice remains.'); - $this->assertText('Third choice', 'Third choice remains.'); - } -} diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollExpirationTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollExpirationTest.php deleted file mode 100644 index 2cfe9e5..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollExpirationTest.php +++ /dev/null @@ -1,73 +0,0 @@ - 'Poll expiration', - 'description' => 'Test the poll auto-expiration logic.', - 'group' => 'Poll', - ); - } - - /** - * Tests the expiration of a poll. - */ - function testAutoExpire() { - // Set up a poll. - $title = $this->randomName(); - $choices = $this->_generateChoices(2); - $poll_nid = $this->pollCreate($title, $choices, FALSE); - $this->assertTrue($poll_nid, 'Poll for auto-expire test created.'); - - // Visit the poll edit page and verify that by default, expiration - // is set to unlimited. - $this->drupalGet("node/$poll_nid/edit"); - $this->assertField('runtime', 'Poll expiration setting found.'); - $elements = $this->xpath('//select[@id="edit-runtime"]/option[@selected="selected"]'); - $this->assertTrue(isset($elements[0]['value']) && $elements[0]['value'] == 0, 'Poll expiration set to unlimited.'); - - // Set the expiration to one week. - $edit = array(); - $poll_expiration = 604800; // One week. - $edit['runtime'] = $poll_expiration; - $this->drupalPost(NULL, $edit, t('Save')); - $this->assertRaw(t('Poll %title has been updated.', array('%title' => $title)), 'Poll expiration settings saved.'); - - // Make sure that the changed expiration settings is kept. - $this->drupalGet("node/$poll_nid/edit"); - $elements = $this->xpath('//select[@id="edit-runtime"]/option[@selected="selected"]'); - $this->assertTrue(isset($elements[0]['value']) && $elements[0]['value'] == $poll_expiration, 'Poll expiration set to unlimited.'); - - // Force a cron run. Since the expiration date has not yet been reached, - // the poll should remain active. - drupal_cron_run(); - $this->drupalGet("node/$poll_nid/edit"); - $elements = $this->xpath('//input[@id="edit-active-1"]'); - $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), 'Poll is still active.'); - - // Test expiration. Since REQUEST_TIME is a constant and we don't - // want to keep SimpleTest waiting until the moment of expiration arrives, - // we forcibly change the expiration date in the database. - $created = db_query('SELECT created FROM {node} WHERE nid = :nid', array(':nid' => $poll_nid))->fetchField(); - db_update('node') - ->fields(array('created' => $created - ($poll_expiration * 1.01))) - ->condition('nid', $poll_nid) - ->execute(); - - // Run cron and verify that the poll is now marked as "closed". - drupal_cron_run(); - $this->drupalGet("node/$poll_nid/edit"); - $elements = $this->xpath('//input[@id="edit-active-0"]'); - $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), 'Poll has expired.'); - } -} diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollJsAddChoiceTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollJsAddChoiceTest.php deleted file mode 100644 index 88acc3b..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollJsAddChoiceTest.php +++ /dev/null @@ -1,54 +0,0 @@ - 'Poll add choice', - 'description' => 'Submits a POST request for an additional poll choice.', - 'group' => 'Poll' - ); - } - - /** - * Tests adding a new choice to a poll. - */ - function testAddChoice() { - $web_user = $this->drupalCreateUser(array('create poll content', 'access content')); - $this->drupalLogin($web_user); - $this->drupalGet('node/add/poll'); - $edit = array( - "title" => $this->randomName(), - 'choice[new:0][chtext]' => $this->randomName(), - 'choice[new:1][chtext]' => $this->randomName(), - ); - - // Press 'add choice' button through Ajax, and place the expected HTML result - // as the tested content. - $commands = $this->drupalPostAJAX(NULL, $edit, array('op' => t('Add another choice'))); - $this->content = $commands[1]['data']; - - $this->assertFieldByName('choice[chid:0][chtext]', $edit['choice[new:0][chtext]'], format_string('Field !i found', array('!i' => 0))); - $this->assertFieldByName('choice[chid:1][chtext]', $edit['choice[new:1][chtext]'], format_string('Field !i found', array('!i' => 1))); - $this->assertFieldByName('choice[new:0][chtext]', '', format_string('Field !i found', array('!i' => 2))); - } -} diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollTestBase.php b/core/modules/poll/lib/Drupal/poll/Tests/PollTestBase.php deleted file mode 100644 index 94da1ef..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollTestBase.php +++ /dev/null @@ -1,202 +0,0 @@ -assertTrue(TRUE, 'Create a poll'); - - $admin_user = $this->drupalCreateUser(array('create poll content', 'administer nodes')); - $web_user = $this->drupalCreateUser(array('create poll content', 'access content', 'edit own poll content')); - $this->drupalLogin($admin_user); - - // Get the form first to initialize the state of the internal browser. - $this->drupalGet('node/add/poll'); - - // Prepare a form with two choices. - list($edit, $index) = $this->_pollGenerateEdit($title, $choices); - - // Verify that the vote count element only allows non-negative integers. - $edit['choice[new:1][chvotes]'] = -1; - $edit['choice[new:0][chvotes]'] = $this->randomString(7); - $this->drupalPost(NULL, $edit, t('Save')); - $this->assertText(t('Vote count for new choice must be higher or equal to 0.')); - $this->assertText(t('Vote count for new choice must be a number.')); - - // Repeat steps for initializing the state of the internal browser. - $this->drupalLogin($web_user); - $this->drupalGet('node/add/poll'); - list($edit, $index) = $this->_pollGenerateEdit($title, $choices); - - // Re-submit the form until all choices are filled in. - if (count($choices) > 2) { - while ($index < count($choices)) { - $this->drupalPost(NULL, $edit, t('Add another choice')); - $this->assertPollChoiceOrder($choices, $index); - list($edit, $index) = $this->_pollGenerateEdit($title, $choices, $index); - } - } - - if ($preview) { - $this->drupalPost(NULL, $edit, t('Preview')); - $this->assertPollChoiceOrder($choices, $index, TRUE); - list($edit, $index) = $this->_pollGenerateEdit($title, $choices, $index); - } - - $this->drupalPost(NULL, $edit, t('Save')); - $node = $this->drupalGetNodeByTitle($title); - $this->assertText(t('@type @title has been created.', array('@type' => node_type_get_label('poll'), '@title' => $title)), 'Poll has been created.'); - $this->assertTrue($node->nid, 'Poll has been found in the database.'); - - return isset($node->nid) ? $node->nid : FALSE; - } - - /** - * Generates POST values for the poll node form, specifically poll choices. - * - * @param $title - * The title for the poll node. - * @param $choices - * An array containing poll choices, as generated by - * PollTestBase::_generateChoices(). - * @param $index - * (optional) The amount/number of already submitted poll choices. Defaults - * to 0. - * - * @return - * An indexed array containing: - * - The generated POST values, suitable for - * Drupal\simpletest\WebTestBase::drupalPost(). - * - The number of poll choices contained in 'edit', for potential re-usage - * in subsequent invocations of this function. - */ - function _pollGenerateEdit($title, array $choices, $index = 0) { - $max_new_choices = ($index == 0 ? 2 : 1); - $already_submitted_choices = array_slice($choices, 0, $index); - $new_choices = array_values(array_slice($choices, $index, $max_new_choices)); - - $edit = array( - 'title' => $title, - ); - foreach ($already_submitted_choices as $k => $text) { - $edit['choice[chid:' . $k . '][chtext]'] = $text; - } - foreach ($new_choices as $k => $text) { - $edit['choice[new:' . $k . '][chtext]'] = $text; - } - return array($edit, count($already_submitted_choices) + count($new_choices)); - } - - /* - * Generates random choices for the poll. - */ - function _generateChoices($count = 7) { - $choices = array(); - for ($i = 1; $i <= $count; $i++) { - $choices[] = $this->randomName(); - } - return $choices; - } - - /** - * Asserts correct poll choice order in the node form after submission. - * - * Verifies both the order in the DOM and in the 'weight' form elements. - * - * @param $choices - * An array containing poll choices, as generated by - * PollTestBase::_generateChoices(). - * @param $index - * (optional) The amount/number of already submitted poll choices. Defaults - * to 0. - * @param $preview - * (optional) Whether to also check the poll preview. - * - * @see PollTestBase::_pollGenerateEdit() - */ - function assertPollChoiceOrder(array $choices, $index = 0, $preview = FALSE) { - $expected = array(); - $weight = 0; - foreach ($choices as $id => $label) { - if ($id < $index) { - // The expected weight of each choice is higher than the previous one. - $weight++; - // Directly assert the weight form element value for this choice. - $this->assertFieldByName('choice[chid:' . $id . '][weight]', $weight, format_string('Found choice @id with weight @weight.', array( - '@id' => $id, - '@weight' => $weight, - ))); - // Append to our (to be reversed) stack of labels. - $expected[$weight] = $label; - } - } - ksort($expected); - - // Verify DOM order of poll choices (i.e., #weight of form elements). - $elements = $this->xpath('//input[starts-with(@name, :prefix) and contains(@name, :suffix)]', array( - ':prefix' => 'choice[chid:', - ':suffix' => '][chtext]', - )); - $expected_order = $expected; - foreach ($elements as $element) { - $next_label = array_shift($expected_order); - $this->assertEqual((string) $element['value'], $next_label); - } - - // If requested, also verify DOM order in preview. - if ($preview) { - $elements = $this->xpath('//div[contains(@class, :teaser)]/descendant::div[@class=:text]', array( - ':teaser' => 'node-teaser', - ':text' => 'text', - )); - $expected_order = $expected; - foreach ($elements as $element) { - $next_label = array_shift($expected_order); - $this->assertEqual((string) $element, $next_label, format_string('Found choice @label in preview.', array( - '@label' => $next_label, - ))); - } - } - } - - /** - * Tests updating a poll. - */ - function pollUpdate($nid, $title, $edit) { - // Edit the poll node. - $this->drupalPost('node/' . $nid . '/edit', $edit, t('Save')); - $this->assertText(t('@type @title has been updated.', array('@type' => node_type_get_label('poll'), '@title' => $title)), 'Poll has been updated.'); - } -} diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollTokenReplaceTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollTokenReplaceTest.php deleted file mode 100644 index 13f2f79..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollTokenReplaceTest.php +++ /dev/null @@ -1,93 +0,0 @@ - 'Poll token replacement', - 'description' => 'Generates text using placeholders for dummy content to check poll token replacement.', - 'group' => 'Poll', - ); - } - - /** - * Creates a poll, then tests the tokens generated from it. - */ - function testPollTokenReplacement() { - $language_interface = language(LANGUAGE_TYPE_INTERFACE); - - // Craete a poll with three choices. - $title = $this->randomName(); - $choices = $this->_generateChoices(3); - $poll_nid = $this->pollCreate($title, $choices, FALSE); - $this->drupalLogout(); - - // Create four users and have each of them vote. - $vote_user1 = $this->drupalCreateUser(array('vote on polls', 'access content')); - $this->drupalLogin($vote_user1); - $edit = array( - 'choice' => '1', - ); - $this->drupalPost('node/' . $poll_nid, $edit, t('Vote')); - $this->drupalLogout(); - - $vote_user2 = $this->drupalCreateUser(array('vote on polls', 'access content')); - $this->drupalLogin($vote_user2); - $edit = array( - 'choice' => '1', - ); - $this->drupalPost('node/' . $poll_nid, $edit, t('Vote')); - $this->drupalLogout(); - - $vote_user3 = $this->drupalCreateUser(array('vote on polls', 'access content')); - $this->drupalLogin($vote_user3); - $edit = array( - 'choice' => '2', - ); - $this->drupalPost('node/' . $poll_nid, $edit, t('Vote')); - $this->drupalLogout(); - - $vote_user4 = $this->drupalCreateUser(array('vote on polls', 'access content')); - $this->drupalLogin($vote_user4); - $edit = array( - 'choice' => '3', - ); - $this->drupalPost('node/' . $poll_nid, $edit, t('Vote')); - $this->drupalLogout(); - - $poll = node_load($poll_nid, TRUE); - - // Generate and test sanitized tokens. - $tests = array(); - $tests['[node:poll-votes]'] = 4; - $tests['[node:poll-winner]'] = filter_xss($poll->choice[1]['chtext']); - $tests['[node:poll-winner-votes]'] = 2; - $tests['[node:poll-winner-percent]'] = 50; - $tests['[node:poll-duration]'] = format_interval($poll->runtime, 1, $language_interface->langcode); - - // Test to make sure that we generated something for each token. - $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.'); - - foreach ($tests as $input => $expected) { - $output = token_replace($input, array('node' => $poll), array('langcode' => $language_interface->langcode)); - $this->assertEqual($output, $expected, format_string('Sanitized poll token %token replaced.', array('%token' => $input))); - } - - // Generate and test unsanitized tokens. - $tests['[node:poll-winner]'] = $poll->choice[1]['chtext']; - - foreach ($tests as $input => $expected) { - $output = token_replace($input, array('node' => $poll), array('langcode' => $language_interface->langcode, 'sanitize' => FALSE)); - $this->assertEqual($output, $expected, format_string('Unsanitized poll token %token replaced.', array('%token' => $input))); - } - } -} diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollTranslateTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollTranslateTest.php deleted file mode 100644 index d1ce358..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollTranslateTest.php +++ /dev/null @@ -1,83 +0,0 @@ - 'Poll translation', - 'description' => 'Test the poll translation logic.', - 'group' => 'Poll', - ); - } - - /** - * Tests poll creation and translation. - * - * Checks that the choice names get copied from the original poll and that - * the vote count values are set to 0. - */ - function testPollTranslate() { - $admin_user = $this->drupalCreateUser(array('administer content types', 'administer languages', 'edit any poll content', 'create poll content', 'administer nodes', 'translate all content')); - - // Set up a poll with two choices. - $title = $this->randomName(); - $choices = array($this->randomName(), $this->randomName()); - $poll_nid = $this->pollCreate($title, $choices, FALSE); - $this->assertTrue($poll_nid, 'Poll for translation logic test created.'); - - $this->drupalLogout(); - $this->drupalLogin($admin_user); - - // Enable a second language. - $this->drupalGet('admin/config/regional/language'); - $edit = array(); - $edit['predefined_langcode'] = 'nl'; - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); - $this->assertRaw(t('The language %language has been created and can now be used.', array('%language' => 'Dutch')), 'Language Dutch has been created.'); - - // Set "Poll" content type to use multilingual support with translation. - $this->drupalGet('admin/structure/types/manage/poll'); - $edit = array('language_configuration[language_hidden]' => FALSE, 'node_type_language_translation_enabled' => TRUE); - $this->drupalPost('admin/structure/types/manage/poll', $edit, t('Save content type')); - $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Poll')), 'Poll content type has been updated.'); - - // Edit poll. - $this->drupalGet("node/$poll_nid/edit"); - $edit = array(); - // Set the poll's first choice count to 200. - $edit['choice[chid:1][chvotes]'] = 200; - // Set the language to Dutch. - $edit['langcode'] = 'nl'; - $this->drupalPost(NULL, $edit, t('Save')); - - // Translate the Dutch poll. - $this->drupalGet('node/add/poll', array('query' => array('translation' => $poll_nid, 'target' => 'en'))); - - $dutch_poll = node_load($poll_nid); - - // Check that the vote count values didn't get copied from the Dutch poll - // and are set to 0. - $this->assertFieldByName('choice[chid:1][chvotes]', '0', ('Found choice with vote count 0')); - $this->assertFieldByName('choice[chid:2][chvotes]', '0', ('Found choice with vote count 0')); - // Check that the choice names got copied from the Dutch poll. - $this->assertFieldByName('choice[chid:1][chtext]', $dutch_poll->choice[1]['chtext'], format_string('Found choice with text @text', array('@text' => $dutch_poll->choice[1]['chtext']))); - $this->assertFieldByName('choice[chid:2][chtext]', $dutch_poll->choice[2]['chtext'], format_string('Found choice with text @text', array('@text' => $dutch_poll->choice[2]['chtext']))); - } -} diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollVoteCheckHostnameTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollVoteCheckHostnameTest.php deleted file mode 100644 index 8efc02c..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollVoteCheckHostnameTest.php +++ /dev/null @@ -1,152 +0,0 @@ - 'User poll vote capability.', - 'description' => 'Check that users and anonymous users from specified ip-address can only vote once.', - 'group' => 'Poll' - ); - } - - function setUp() { - parent::setUp(); - - // Create and login user. - $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'create poll content')); - $this->drupalLogin($this->admin_user); - - // Allow anonymous users to vote on polls. - user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array( - 'access content' => TRUE, - 'vote on polls' => TRUE, - 'cancel own vote' => TRUE, - )); - - // Enable page cache to verify that the result page is not saved in the - // cache when anonymous voting is allowed. - $config = config('system.performance'); - $config->set('cache.page.enabled', 1); - $config->save(); - - // Create poll. - $title = $this->randomName(); - $choices = $this->_generateChoices(3); - $this->poll_nid = $this->pollCreate($title, $choices, FALSE); - - $this->drupalLogout(); - - // Create web users. - $this->web_user1 = $this->drupalCreateUser(array('access content', 'vote on polls', 'cancel own vote')); - $this->web_user2 = $this->drupalCreateUser(array('access content', 'vote on polls')); - } - - /** - * Checks that anonymous users with the same IP address can only vote once. - * - * Also checks that authenticated users can only vote once, even when the - * user's IP address has changed. - */ - function testHostnamePollVote() { - // Login User1. - $this->drupalLogin($this->web_user1); - - $edit = array( - 'choice' => '1', - ); - - // User1 vote on Poll. - $this->drupalPost('node/' . $this->poll_nid, $edit, t('Vote')); - $this->assertText(t('Your vote was recorded.'), format_string('%user vote was recorded.', array('%user' => $this->web_user1->name))); - $this->assertText(t('Total votes: @votes', array('@votes' => 1)), 'Vote count updated correctly.'); - - // Check to make sure User1 cannot vote again. - $this->drupalGet('node/' . $this->poll_nid); - $elements = $this->xpath('//input[@value="Vote"]'); - $this->assertTrue(empty($elements), format_string("%user is not able to vote again.", array('%user' => $this->web_user1->name))); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(!empty($elements), "'Cancel your vote' button appears."); - - // Logout User1. - $this->drupalLogout(); - - // Fill the page cache by requesting the poll. - $this->drupalGet('node/' . $this->poll_nid); - $this->assertEqual($this->drupalGetHeader('x-drupal-cache'), 'MISS', 'Page was cacheable but was not in the cache.'); - $this->drupalGet('node/' . $this->poll_nid); - $this->assertEqual($this->drupalGetHeader('x-drupal-cache'), 'HIT', 'Page was cached.'); - - // Anonymous user vote on Poll. - $this->drupalPost(NULL, $edit, t('Vote')); - $this->assertText(t('Your vote was recorded.'), 'Anonymous vote was recorded.'); - $this->assertText(t('Total votes: @votes', array('@votes' => 2)), 'Vote count updated correctly.'); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(!empty($elements), "'Cancel your vote' button appears."); - - // Check to make sure Anonymous user cannot vote again. - $this->drupalGet('node/' . $this->poll_nid); - $this->assertFalse($this->drupalGetHeader('x-drupal-cache'), 'Page was not cacheable.'); - $elements = $this->xpath('//input[@value="Vote"]'); - $this->assertTrue(empty($elements), "Anonymous is not able to vote again."); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(!empty($elements), "'Cancel your vote' button appears."); - - // Login User2. - $this->drupalLogin($this->web_user2); - - // User2 vote on poll. - $this->drupalPost('node/' . $this->poll_nid, $edit, t('Vote')); - $this->assertText(t('Your vote was recorded.'), format_string('%user vote was recorded.', array('%user' => $this->web_user2->name))); - $this->assertText(t('Total votes: @votes', array('@votes' => 3)), 'Vote count updated correctly.'); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(empty($elements), "'Cancel your vote' button does not appear."); - - // Logout User2. - $this->drupalLogout(); - - // Change host name for anonymous users. - db_update('poll_vote') - ->fields(array( - 'hostname' => '123.456.789.1', - )) - ->condition('hostname', '', '<>') - ->execute(); - - // Check to make sure Anonymous user can vote again with a new session after - // a hostname change. - $this->drupalGet('node/' . $this->poll_nid); - $this->assertEqual($this->drupalGetHeader('x-drupal-cache'), 'MISS', 'Page was cacheable but was not in the cache.'); - $this->drupalPost(NULL, $edit, t('Vote')); - $this->assertText(t('Your vote was recorded.'), format_string('%user vote was recorded.', array('%user' => $this->web_user2->name))); - $this->assertText(t('Total votes: @votes', array('@votes' => 4)), 'Vote count updated correctly.'); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(!empty($elements), "'Cancel your vote' button appears."); - - // Check to make sure Anonymous user cannot vote again with a new session, - // and that the vote from the previous session cannot be cancelledd. - $this->curlClose(); - $this->drupalGet('node/' . $this->poll_nid); - $this->assertEqual($this->drupalGetHeader('x-drupal-cache'), 'MISS', 'Page was cacheable but was not in the cache.'); - $elements = $this->xpath('//input[@value="Vote"]'); - $this->assertTrue(empty($elements), 'Anonymous is not able to vote again.'); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(empty($elements), "'Cancel your vote' button does not appear."); - - // Login User1. - $this->drupalLogin($this->web_user1); - - // Check to make sure User1 still cannot vote even after hostname changed. - $this->drupalGet('node/' . $this->poll_nid); - $elements = $this->xpath('//input[@value="Vote"]'); - $this->assertTrue(empty($elements), format_string("%user is not able to vote again.", array('%user' => $this->web_user1->name))); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(!empty($elements), "'Cancel your vote' button appears."); - } -} diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollVoteTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollVoteTest.php deleted file mode 100644 index b8a2585..0000000 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollVoteTest.php +++ /dev/null @@ -1,86 +0,0 @@ - 'Poll vote', - 'description' => 'Vote on a poll', - 'group' => 'Poll' - ); - } - - function tearDown() { - parent::tearDown(); - } - - /** - * Tests voting on a poll. - */ - function testPollVote() { - $title = $this->randomName(); - $choices = $this->_generateChoices(7); - $poll_nid = $this->pollCreate($title, $choices, FALSE); - $this->drupalLogout(); - - $vote_user = $this->drupalCreateUser(array('cancel own vote', 'inspect all votes', 'vote on polls', 'access content')); - $restricted_vote_user = $this->drupalCreateUser(array('vote on polls', 'access content')); - - $this->drupalLogin($vote_user); - - // Record a vote for the first choice. - $edit = array( - 'choice' => '1', - ); - $this->drupalPost('node/' . $poll_nid, $edit, t('Vote')); - $this->assertText('Your vote was recorded.', 'Your vote was recorded.'); - $this->assertText('Total votes: 1', 'Vote count updated correctly.'); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(isset($elements[0]), "'Cancel your vote' button appears."); - - $this->drupalGet("node/$poll_nid/votes"); - $this->assertText(t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'), 'Vote table text.'); - $this->assertText($choices[0], 'Vote recorded'); - - // Ensure poll listing page has correct number of votes. - $this->drupalGet('poll'); - $this->assertText($title, 'Poll appears in poll list.'); - $this->assertText('1 vote', 'Poll has 1 vote.'); - - // Cancel a vote. - $this->drupalPost('node/' . $poll_nid, array(), t('Cancel your vote')); - $this->assertText('Your vote was cancelled.', 'Your vote was cancelled.'); - $this->assertNoText('Cancel your vote', "Cancel vote button doesn't appear."); - - $this->drupalGet("node/$poll_nid/votes"); - $this->assertNoText($choices[0], 'Vote cancelled'); - - // Ensure poll listing page has correct number of votes. - $this->drupalGet('poll'); - $this->assertText($title, 'Poll appears in poll list.'); - $this->assertText('0 votes', 'Poll has 0 votes.'); - - // Log in as a user who can only vote on polls. - $this->drupalLogout(); - $this->drupalLogin($restricted_vote_user); - - // Vote on a poll. - $edit = array( - 'choice' => '1', - ); - $this->drupalPost('node/' . $poll_nid, $edit, t('Vote')); - $this->assertText('Your vote was recorded.', 'Your vote was recorded.'); - $this->assertText('Total votes: 1', 'Vote count updated correctly.'); - $elements = $this->xpath('//input[@value="Cancel your vote"]'); - $this->assertTrue(empty($elements), "'Cancel your vote' button does not appear."); - } -} diff --git a/core/modules/poll/poll.admin.css b/core/modules/poll/poll.admin.css deleted file mode 100644 index f118de3..0000000 --- a/core/modules/poll/poll.admin.css +++ /dev/null @@ -1,17 +0,0 @@ - -/** - * @file - * Admin stylesheet for the Poll module. - */ - -.node-form #edit-poll-more { - margin: 0; -} -.node-form #poll-choice-table .form-text { - display: inline; - width: auto; -} -.node-form #poll-choice-table td.choice-flag { - white-space: nowrap; - width: 4em; -} diff --git a/core/modules/poll/poll.base-rtl.css b/core/modules/poll/poll.base-rtl.css deleted file mode 100644 index 7c737a9..0000000 --- a/core/modules/poll/poll.base-rtl.css +++ /dev/null @@ -1,9 +0,0 @@ - -/** - * @file - * Right-to-left specfic base stylesheet for the Poll module. - */ - -.poll .bar .foreground { - float: right; -} diff --git a/core/modules/poll/poll.base.css b/core/modules/poll/poll.base.css deleted file mode 100644 index 1d24c67..0000000 --- a/core/modules/poll/poll.base.css +++ /dev/null @@ -1,19 +0,0 @@ - -/** - * @file - * Base stylesheet for the Poll module. - */ - -.poll { - overflow: hidden; -} -.poll .bar { - height: 1em; - margin: 1px 0; - background-color: #ddd; -} -.poll .bar .foreground { - background-color: #000; - height: 1em; - float: left; /* LTR */ -} diff --git a/core/modules/poll/poll.install b/core/modules/poll/poll.install deleted file mode 100644 index 75896bb..0000000 --- a/core/modules/poll/poll.install +++ /dev/null @@ -1,149 +0,0 @@ - 'Stores poll-specific information for poll nodes.', - 'fields' => array( - 'nid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => "The poll's {node}.nid.", - ), - 'runtime' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The number of seconds past {node}.created during which the poll is open.', - ), - 'active' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Boolean indicating whether or not the poll is open.', - ), - ), - 'primary key' => array('nid'), - 'foreign keys' => array( - 'poll_node' => array( - 'table' => 'node', - 'columns' => array('nid' => 'nid'), - ), - ), - ); - - $schema['poll_choice'] = array( - 'description' => 'Stores information about all choices for all {poll}s.', - 'fields' => array( - 'chid' => array( - 'type' => 'serial', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'description' => 'Unique identifier for a poll choice.', - ), - 'nid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {node}.nid this choice belongs to.', - ), - 'chtext' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The text for this choice.', - 'translatable' => TRUE, - ), - 'chvotes' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The total number of votes this choice has received by all users.', - ), - 'weight' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The sort order of this choice among all choices for the same node.', - ), - ), - 'indexes' => array( - 'nid' => array('nid'), - ), - 'primary key' => array('chid'), - 'foreign keys' => array( - 'choice_node' => array( - 'table' => 'node', - 'columns' => array('nid' => 'nid'), - ), - ), - ); - - $schema['poll_vote'] = array( - 'description' => 'Stores per-{users} votes for each {poll}.', - 'fields' => array( - 'chid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'description' => "The {users}'s vote for this poll.", - ), - 'nid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'description' => 'The {poll} node this vote is for.', - ), - 'uid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {users}.uid this vote is from unless the voter was anonymous.', - ), - 'hostname' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The IP address this vote is from unless the voter was logged in.', - ), - 'timestamp' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The timestamp of the vote creation.', - ), - ), - 'primary key' => array('nid', 'uid', 'hostname'), - 'foreign keys' => array( - 'poll_node' => array( - 'table' => 'node', - 'columns' => array('nid' => 'nid'), - ), - 'voter' => array( - 'table' => 'users', - 'columns' => array('uid' => 'uid'), - ), - ), - 'indexes' => array( - 'chid' => array('chid'), - 'hostname' => array('hostname'), - 'uid' => array('uid'), - ), - ); - - return $schema; -} diff --git a/core/modules/poll/poll.pages.inc b/core/modules/poll/poll.pages.inc deleted file mode 100644 index b67d8f9..0000000 --- a/core/modules/poll/poll.pages.inc +++ /dev/null @@ -1,125 +0,0 @@ -addExpression('COUNT(*)', 'expression'); - $count_select->join('poll', 'p', 'p.nid = n.nid'); - $count_select->condition('n.status', 1); - - // List all polls. - $select = db_select('node', 'n'); - $select->join('poll', 'p', 'p.nid = n.nid'); - $select->join('poll_choice', 'c', 'c.nid = n.nid'); - $select->addExpression('SUM(c.chvotes)', 'votes'); - $select = $select->fields('n', array('nid', 'title', 'created')) - ->fields('p', array('active')) - ->condition('n.status', 1) - ->orderBy('n.created', 'DESC') - ->groupBy('n.nid') - ->groupBy('n.title') - ->groupBy('p.active') - ->groupBy('n.created') - ->extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->limit($polls_per_page) - ->addTag('node_access'); - $select->setCountQuery($count_select); - $queried_nodes = $select->execute() - ->fetchAllAssoc('nid'); - - $output = ''; - $output .= theme('pager'); - return $output; -} - -/** - * Page callback: Displays the 'votes' tab for polls. - * - * This page displays a table containing each vote that has been cast. - * - * @param $node - * The poll node object. - * - * @return - * Render array containing table with votes. - * - * @see poll_menu() - */ -function poll_votes($node) { - $votes_per_page = 20; - drupal_set_title($node->label()); - - $header[] = array('data' => t('Visitor'), 'field' => 'u.name'); - $header[] = array('data' => t('Vote'), 'field' => 'pc.chtext'); - $header[] = array('data' => t('Timestamp'), 'field' => 'pv.timestamp', 'sort' => 'desc'); - - $select = db_select('poll_vote', 'pv') - ->extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->extend('Drupal\Core\Database\Query\TableSortExtender'); - $select->join('poll_choice', 'pc', 'pv.chid = pc.chid'); - $select->join('users', 'u', 'pv.uid = u.uid'); - $queried_votes = $select - ->addTag('translatable') - ->fields('pv', array('chid', 'uid', 'hostname', 'timestamp', 'nid')) - ->fields('pc', array('chtext')) - ->fields('u', array('name')) - ->condition('pv.nid', $node->nid) - ->limit($votes_per_page) - ->orderByHeader($header) - ->execute(); - - $rows = array(); - foreach ($queried_votes as $vote) { - $rows[] = array( - $vote->name ? theme('username', array('account' => $vote)) : check_plain($vote->hostname), - check_plain($vote->chtext), - format_date($vote->timestamp), - ); - } - $build['poll_votes_table'] = array( - '#theme' => 'table', - '#header' => $header, - '#rows' => $rows, - '#prefix' => t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'), - ); - $build['poll_votes_pager'] = array('#theme' => 'pager'); - return $build; -} - -/** - * Page callback: Displays the 'results' tab for the current poll. - * - * This tab displays a summary of the votes that have been cast. - * - * @param $node - * The poll node object. - * - * @return - * An array suitable for use by drupal_render(). - * - * @see poll_menu() - */ -function poll_results($node) { - drupal_set_title($node->label()); - $node->show_results = TRUE; - return node_show($node); -} diff --git a/core/modules/poll/poll.theme-rtl.css b/core/modules/poll/poll.theme-rtl.css deleted file mode 100644 index 2ba85c6..0000000 --- a/core/modules/poll/poll.theme-rtl.css +++ /dev/null @@ -1,12 +0,0 @@ - -/** - * @file - * Right-to-left specfic theme stylesheet for the Poll module. - */ - -.poll .percent { - text-align: left; -} -.poll .vote-form { - text-align: right; -} diff --git a/core/modules/poll/poll.theme.css b/core/modules/poll/poll.theme.css deleted file mode 100644 index 3e91786..0000000 --- a/core/modules/poll/poll.theme.css +++ /dev/null @@ -1,34 +0,0 @@ - -/** - * @file - * Theme stylesheet for the Poll module. - */ - -.poll dl, -.poll dd { - margin: 0; -} -.poll .links { - text-align: center; -} -.poll .percent { - text-align: right; /* LTR */ -} -.poll .total { - text-align: center; -} -.poll .vote-form { - text-align: center; -} -.poll .vote-form { - text-align: left; /* LTR */ -} -.poll .vote-form .poll-title { - font-weight: bold; -} -td.poll-chtext { - width: 80%; -} -td.poll-chvotes .form-text { - width: 85%; -} diff --git a/core/modules/poll/poll.tokens.inc b/core/modules/poll/poll.tokens.inc deleted file mode 100644 index e0f9b2b..0000000 --- a/core/modules/poll/poll.tokens.inc +++ /dev/null @@ -1,107 +0,0 @@ - t("Poll votes"), - 'description' => t("The number of votes that have been cast on a poll."), - ); - $node['poll-winner'] = array( - 'name' => t("Poll winner"), - 'description' => t("The winning poll answer."), - ); - $node['poll-winner-votes'] = array( - 'name' => t("Poll winner votes"), - 'description' => t("The number of votes received by the winning poll answer."), - ); - $node['poll-winner-percent'] = array( - 'name' => t("Poll winner percent"), - 'description' => t("The percentage of votes received by the winning poll answer."), - ); - $node['poll-duration'] = array( - 'name' => t("Poll duration"), - 'description' => t("The length of time the poll is set to run."), - ); - - return array( - 'tokens' => array('node' => $node), - ); -} - -/** - * Implements hook_tokens(). - */ -function poll_tokens($type, $tokens, array $data = array(), array $options = array()) { - $sanitize = !empty($options['sanitize']); - if (isset($options['langcode'])) { - $url_options['language'] = language_load($options['langcode']); - $langcode = $options['langcode']; - } - else { - $langcode = NULL; - } - - $replacements = array(); - - if ($type == 'node' && !empty($data['node']) && $data['node']->type == 'poll') { - $node = $data['node']; - - $total_votes = 0; - $highest_votes = 0; - foreach ($node->choice as $choice) { - if ($choice['chvotes'] > $highest_votes) { - $winner = $choice; - $highest_votes = $choice['chvotes']; - } - $total_votes = $total_votes + $choice['chvotes']; - } - foreach ($tokens as $name => $original) { - switch ($name) { - case 'poll-votes': - $replacements[$original] = $total_votes; - break; - - case 'poll-winner': - if (isset($winner)) { - $replacements[$original] = $sanitize ? filter_xss($winner['chtext']) : $winner['chtext']; - } - else { - $replacements[$original] = ''; - } - break; - - case 'poll-winner-votes': - if (isset($winner)) { - $replacements[$original] = $winner['chvotes']; - } - else { - $replacements[$original] = ''; - } - break; - - case 'poll-winner-percent': - if (isset($winner)) { - $percent = ($winner['chvotes'] / $total_votes) * 100; - $replacements[$original] = number_format($percent, 0); - } - else { - $replacements[$original] = ''; - } - break; - - case 'poll-duration': - $replacements[$original] = format_interval($node->runtime, 1, $langcode); - break; - } - } - } - - return $replacements; -} diff --git a/core/modules/poll/templates/poll-results.tpl.php b/core/modules/poll/templates/poll-results.tpl.php deleted file mode 100644 index 1e045fa..0000000 --- a/core/modules/poll/templates/poll-results.tpl.php +++ /dev/null @@ -1,38 +0,0 @@ - -
- -

- -
- -
-
- $votes)); ?> -
- - - -
- -
- diff --git a/core/modules/poll/templates/poll-vote.tpl.php b/core/modules/poll/templates/poll-vote.tpl.php deleted file mode 100644 index f2aeb2c..0000000 --- a/core/modules/poll/templates/poll-vote.tpl.php +++ /dev/null @@ -1,31 +0,0 @@ - -
-
- - -

- - - - -
- - -
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index e60b2f5..501fdab 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -258,7 +258,7 @@ * $class_loader = 'apc' * $class_loader = 'default' */ -# $class_loader = 'apc'; +# $settings['class_loader'] = 'apc'; /** * Location of the site configuration files.