@@ -119,7 +119,7 @@ public function __destruct() {
...
@@ -119,7 +119,7 @@ public function __destruct() {
try{
try{
$count=$this->query('SELECT COUNT(*) FROM '.$prefix.'.sqlite_master WHERE type = :type AND name NOT LIKE :pattern',array(':type'=>'table',':pattern'=>'sqlite_%'))->fetchField();
$count=$this->query('SELECT COUNT(*) FROM '.$prefix.'.sqlite_master WHERE type = :type AND name NOT LIKE :pattern',array(':type'=>'table',':pattern'=>'sqlite_%'))->fetchField();
// We can prune the database file if it doens't have any tables.
// We can prune the database file if it doesn't have any tables.
@@ -17,7 +17,7 @@ function field_ui_help($path, $arg) {
...
@@ -17,7 +17,7 @@ function field_ui_help($path, $arg) {
$output.='<h3>'.t('Uses').'</h3>';
$output.='<h3>'.t('Uses').'</h3>';
$output.='<dl>';
$output.='<dl>';
$output.='<dt>'.t('Planning fields').'</dt>';
$output.='<dt>'.t('Planning fields').'</dt>';
$output.='<dd>'.t('There are several decisions you will need to make before definining a field for content, comments, etc.:').'<dl>';
$output.='<dd>'.t('There are several decisions you will need to make before defining a field for content, comments, etc.:').'<dl>';
$output.='<dt>'.t('What the field will be called').'</dt>';
$output.='<dt>'.t('What the field will be called').'</dt>';
$output.='<dd>'.t('A field has a <em>label</em> (the name displayed in the user interface) and a <em>machine name</em> (the name used internally). The label can be changed after you create the field, if needed, but the machine name cannot be changed after you have created the field.').'</li>';
$output.='<dd>'.t('A field has a <em>label</em> (the name displayed in the user interface) and a <em>machine name</em> (the name used internally). The label can be changed after you create the field, if needed, but the machine name cannot be changed after you have created the field.').'</li>';
$output.='<dt>'.t('What type of data the field will store').'</dt>';
$output.='<dt>'.t('What type of data the field will store').'</dt>';
@@ -308,15 +308,15 @@ class HookBootExitTestCase extends DrupalWebTestCase {
...
@@ -308,15 +308,15 @@ class HookBootExitTestCase extends DrupalWebTestCase {
variable_set('page_cache_invoke_hooks',FALSE);
variable_set('page_cache_invoke_hooks',FALSE);
$this->assertTrue(cache('page')->get(url('',array('absolute'=>TRUE))),t('Page has been cached.'));
$this->assertTrue(cache('page')->get(url('',array('absolute'=>TRUE))),t('Page has been cached.'));
$this->drupalGet('');
$this->drupalGet('');
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_boot'))->fetchField(),$calls,t('hook_boot not called with agressive cache and a cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_boot'))->fetchField(),$calls,t('hook_boot not called with aggressive cache and a cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_exit'))->fetchField(),$calls,t('hook_exit not called with agressive cache and a cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_exit'))->fetchField(),$calls,t('hook_exit not called with aggressive cache and a cached page.'));
// Test with page cache cleared, boot and exit should be called.
// Test with page cache cleared, boot and exit should be called.
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_boot'))->fetchField(),$calls,t('hook_boot called with agressive cache and no cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_boot'))->fetchField(),$calls,t('hook_boot called with aggressive cache and no cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_exit'))->fetchField(),$calls,t('hook_exit called with agressive cache and no cached page.'));
$this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message',array(':type'=>'system_test',':message'=>'hook_exit'))->fetchField(),$calls,t('hook_exit called with aggressive cache and no cached page.'));