diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-09-26 23:31:36 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-09-26 23:31:36 +0000 |
| commit | 3780b17654a2af093c854f9c32bd2d6e102ec16c (patch) | |
| tree | 0289b1288109ca1baecbddc7192f1cea84227e3a /modules/field | |
| parent | 88bc80a5974a5ff6bfedf0083934e791bf7cfcd7 (diff) | |
| download | brdo-3780b17654a2af093c854f9c32bd2d6e102ec16c.tar.gz brdo-3780b17654a2af093c854f9c32bd2d6e102ec16c.tar.bz2 | |
- Patch #921606 by munzirtaha, bleen18: various code uses is_null().
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/modules/field_sql_storage/field_sql_storage.module | 2 | ||||
| -rw-r--r-- | modules/field/tests/field_test.module | 2 | ||||
| -rw-r--r-- | modules/field/tests/field_test.storage.inc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module index f916968d1..bc1656bc4 100644 --- a/modules/field/modules/field_sql_storage/field_sql_storage.module +++ b/modules/field/modules/field_sql_storage/field_sql_storage.module @@ -106,7 +106,7 @@ function _field_sql_storage_indexname($name, $index) { */ function _field_sql_storage_etid($entity_type) { $etid = variable_get('field_sql_storage_' . $entity_type . '_etid', NULL); - if (is_null($etid)) { + if (!isset($etid)) { $etid = db_insert('field_config_entity_type')->fields(array('type' => $entity_type))->execute(); variable_set('field_sql_storage_' . $entity_type . '_etid', $etid); } diff --git a/modules/field/tests/field_test.module b/modules/field/tests/field_test.module index 3767a8014..425432303 100644 --- a/modules/field/tests/field_test.module +++ b/modules/field/tests/field_test.module @@ -152,7 +152,7 @@ function field_test_field_language_alter(&$display_language, $context) { function field_test_memorize($key = NULL, $value = NULL) { $memorize = &drupal_static(__FUNCTION__, NULL); - if (is_null($key)) { + if (!isset($key)) { $return = $memorize; $memorize = array(); return $return; diff --git a/modules/field/tests/field_test.storage.inc b/modules/field/tests/field_test.storage.inc index 532598832..8d87c6eb0 100644 --- a/modules/field/tests/field_test.storage.inc +++ b/modules/field/tests/field_test.storage.inc @@ -70,7 +70,7 @@ function field_test_field_storage_details_alter(&$details, $field) { * Helper function: stores or retrieves data from the 'storage backend'. */ function _field_test_storage_data($data = NULL) { - if (is_null($data)) { + if (!isset($data)) { return variable_get('field_test_storage_data', array()); } else { @@ -318,7 +318,7 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor } if ($match) { - if (is_null($skip) || $skipped >= $skip) { + if (!isset($skip) || $skipped >= $skip) { $cursor++; // If querying all revisions and the entity type has revisions, we need // to key the results by revision_ids. |