' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the Save blocks button at the bottom of the page. Click the configure link next to each block to configure its specific title and visibility settings.') . '
';
@@ -306,7 +306,7 @@ function block_page_build(&$page) {
$page['page_top']['backlink'] = array(
'#type' => 'link',
'#title' => t('Exit block region demonstration'),
- '#href' => 'admin/structure/block' . (variable_get('theme_default', 'stark') == $theme ? '' : '/list/' . $theme),
+ '#href' => 'admin/structure/block' . (variable_get('theme_default', 'stark') === $theme ? '' : '/list/' . $theme),
// Add the "overlay-restore" class to indicate this link should restore
// the context in which the region demonstration page was opened.
'#options' => array('attributes' => array('class' => array('block-demo-backlink', 'overlay-restore'))),
@@ -351,7 +351,7 @@ function _block_get_renderable_region($list = array()) {
// the regular 'roles define permissions' schema, it brings too many
// chances of having unwanted output get in the cache and later be served
// to other users. We therefore exclude user 1 from block caching.
- $not_cacheable = $GLOBALS['user']->uid == 1 ||
+ $not_cacheable = $GLOBALS['user']->uid === 1 ||
count(module_implements('node_grants')) ||
!in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD'));
@@ -607,7 +607,7 @@ function block_form_user_profile_form_alter(&$form, &$form_state) {
$blocks[$block->module][$block->delta] = array(
'#type' => 'checkbox',
'#title' => check_plain($data[$block->delta]['info']),
- '#default_value' => isset($account->data['block'][$block->module][$block->delta]) ? $account->data['block'][$block->module][$block->delta] : ($block->custom == 1),
+ '#default_value' => isset($account->data['block'][$block->module][$block->delta]) ? $account->data['block'][$block->module][$block->delta] : ($block->custom === 1),
);
}
}
@@ -806,7 +806,7 @@ function block_block_list_alter(&$blocks) {
$enabled = $user->data['block'][$block->module][$block->delta];
}
else {
- $enabled = ($block->custom == BLOCK_CUSTOM_ENABLED);
+ $enabled = ($block->custom === BLOCK_CUSTOM_ENABLED);
}
}
else {
@@ -814,7 +814,7 @@ function block_block_list_alter(&$blocks) {
}
// Limited visibility blocks must list at least one page.
- if ($block->visibility == BLOCK_VISIBILITY_LISTED && empty($block->pages)) {
+ if ($block->visibility === BLOCK_VISIBILITY_LISTED && empty($block->pages)) {
$enabled = FALSE;
}
@@ -903,7 +903,7 @@ function _block_get_renderable_block($element) {
if ($block->title) {
// Check plain here to allow module generated titles to keep any
// markup.
- $block->subject = $block->title == '' ? '' : check_plain($block->title);
+ $block->subject = $block->title === '' ? '' : check_plain($block->title);
}
// Add the content renderable array to the main element.
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index a29a331..0103fa7 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -95,9 +95,9 @@ function book_node_view_link($node, $view_mode) {
$links = array();
if (isset($node->book['depth'])) {
- if ($view_mode == 'full' && node_is_page($node)) {
+ if ($view_mode === 'full' && node_is_page($node)) {
$child_type = variable_get('book_child_type', 'book');
- if ((user_access('add content to books') || user_access('administer book outlines')) && node_access('create', $child_type) && $node->status == 1 && $node->book['depth'] < MENU_MAX_DEPTH) {
+ if ((user_access('add content to books') || user_access('administer book outlines')) && node_access('create', $child_type) && $node->status === 1 && $node->book['depth'] < MENU_MAX_DEPTH) {
$links['book_add_child'] = array(
'title' => t('Add child page'),
'href' => 'node/add/' . str_replace('_', '-', $child_type),
@@ -282,12 +282,12 @@ function book_block_view($delta = '') {
$current_bid = empty($node->book['bid']) ? 0 : $node->book['bid'];
}
- if (variable_get('book_block_mode', 'all pages') == 'all pages') {
+ if (variable_get('book_block_mode', 'all pages') === 'all pages') {
$block['subject'] = t('Book navigation');
$book_menus = array();
$pseudo_tree = array(0 => array('below' => FALSE));
foreach (book_get_books() as $book_id => $book) {
- if ($book['bid'] == $current_bid) {
+ if ($book['bid'] === $current_bid) {
// If the current page is a node associated with a book, the menu
// needs to be retrieved.
$book_menus[$book_id] = menu_tree_output(menu_tree_all_data($node->book['menu_name'], $node->book));
@@ -567,7 +567,7 @@ function _book_add_form_elements(&$form, &$form_state, $node) {
$options = array();
$nid = isset($node->nid) ? $node->nid : 'new';
- if (isset($node->nid) && ($nid == $node->book['original_bid']) && ($node->book['parent_depth_limit'] == 0)) {
+ if (isset($node->nid) && ($nid === $node->book['original_bid']) && ($node->book['parent_depth_limit'] === 0)) {
// This is the top level node in a maximum depth book and thus cannot be moved.
$options[$node->nid] = $node->title;
}
@@ -577,7 +577,7 @@ function _book_add_form_elements(&$form, &$form_state, $node) {
}
}
- if (user_access('create new books') && ($nid == 'new' || ($nid != $node->book['original_bid']))) {
+ if (user_access('create new books') && ($nid === 'new' || ($nid != $node->book['original_bid']))) {
// The node can become a new book, if it is not one already.
$options = array($nid => '<' . t('create a new book') . '>') + $options;
}
@@ -641,7 +641,7 @@ function _book_update_outline($node) {
$node->book['link_title'] = $node->title;
$node->book['parent_mismatch'] = FALSE; // The normal case.
- if ($node->book['bid'] == $node->nid) {
+ if ($node->book['bid'] === $node->nid) {
$node->book['plid'] = 0;
$node->book['menu_name'] = book_menu_name($node->nid);
}
@@ -772,7 +772,7 @@ function _book_flatten_menu($tree, &$flat) {
*/
function book_prev($book_link) {
// If the parent is zero, we are at the start of a book.
- if ($book_link['plid'] == 0) {
+ if ($book_link['plid'] === 0) {
return NULL;
}
$flat = book_get_flat_menu($book_link);
@@ -783,9 +783,9 @@ function book_prev($book_link) {
list($key, $curr) = each($flat);
} while ($key && $key != $book_link['mlid']);
- if ($key == $book_link['mlid']) {
+ if ($key === $book_link['mlid']) {
// The previous page in the book may be a child of the previous visible link.
- if ($prev['depth'] == $book_link['depth'] && $prev['has_children']) {
+ if ($prev['depth'] === $book_link['depth'] && $prev['has_children']) {
// The subtree will have only one link at the top level - get its data.
$tree = book_menu_subtree_data($prev);
$data = array_shift($tree);
@@ -820,7 +820,7 @@ function book_next($book_link) {
}
while ($key && $key != $book_link['mlid']);
- if ($key == $book_link['mlid']) {
+ if ($key === $book_link['mlid']) {
return current($flat);
}
}
@@ -846,7 +846,7 @@ function book_children($book_link) {
}
while ($link && ($link['mlid'] != $book_link['mlid']));
// Continue though the array and collect the links whose parent is this page.
- while (($link = array_shift($flat)) && $link['plid'] == $book_link['mlid']) {
+ while (($link = array_shift($flat)) && $link['plid'] === $book_link['mlid']) {
$data['link'] = $link;
$data['below'] = '';
$children[] = $data;
@@ -890,7 +890,7 @@ function book_node_load($nodes, $types) {
* Implements hook_node_view().
*/
function book_node_view($node, $view_mode) {
- if ($view_mode == 'full') {
+ if ($view_mode === 'full') {
if (!empty($node->book['bid']) && empty($node->in_preview)) {
$node->content['book_navigation'] = array(
'#markup' => theme('book_navigation', array('book_link' => $node->book)),
@@ -941,7 +941,7 @@ function book_node_presave($node) {
*/
function book_node_insert($node) {
if (!empty($node->book['bid'])) {
- if ($node->book['bid'] == 'new') {
+ if ($node->book['bid'] === 'new') {
// New nodes that are their own book.
$node->book['bid'] = $node->nid;
}
@@ -956,7 +956,7 @@ function book_node_insert($node) {
*/
function book_node_update($node) {
if (!empty($node->book['bid'])) {
- if ($node->book['bid'] == 'new') {
+ if ($node->book['bid'] === 'new') {
// New nodes that are their own book.
$node->book['bid'] = $node->nid;
}
@@ -971,7 +971,7 @@ function book_node_update($node) {
*/
function book_node_predelete($node) {
if (!empty($node->book['bid'])) {
- if ($node->nid == $node->book['bid']) {
+ if ($node->nid === $node->book['bid']) {
// Handle deletion of a top-level post.
$result = db_query("SELECT b.nid FROM {menu_links} ml INNER JOIN {book} b on b.mlid = ml.mlid WHERE ml.plid = :plid", array(
':plid' => $node->book['mlid']
@@ -1070,7 +1070,7 @@ function _book_link_defaults($nid) {
* Implements hook_preprocess_block().
*/
function book_preprocess_block(&$variables) {
- if ($variables['block']-> module == 'book') {
+ if ($variables['block']-> module === 'book') {
$variables['attributes_array']['role'] = 'navigation';
}
}
@@ -1231,7 +1231,7 @@ function template_preprocess_book_export_html(&$variables) {
$variables['title'] = check_plain($variables['title']);
$variables['base_url'] = $base_url;
$variables['language'] = $language_interface;
- $variables['language_rtl'] = ($language_interface->direction == LANGUAGE_RTL);
+ $variables['language_rtl'] = ($language_interface->direction === LANGUAGE_RTL);
$variables['head'] = drupal_get_html_head();
// HTML element attributes.
@@ -1351,7 +1351,7 @@ function book_node_type_update($type) {
}
// Update the setting for the "Add child page" link.
- if (variable_get('book_child_type', 'book') == $type->old_type) {
+ if (variable_get('book_child_type', 'book') === $type->old_type) {
variable_set('book_child_type', $type->type);
}
}
diff --git a/core/modules/color/color.install b/core/modules/color/color.install
index a1879f9..b4a5324 100644
--- a/core/modules/color/color.install
+++ b/core/modules/color/color.install
@@ -11,7 +11,7 @@
function color_requirements($phase) {
$requirements = array();
- if ($phase == 'runtime') {
+ if ($phase === 'runtime') {
// Check for the PHP GD library.
if (function_exists('imagegd2')) {
$info = gd_info();
diff --git a/core/modules/color/color.js b/core/modules/color/color.js
index 6ed789a..926d645 100644
--- a/core/modules/color/color.js
+++ b/core/modules/color/color.js
@@ -10,7 +10,7 @@ Drupal.behaviors.color = {
var i, j, colors, field_name;
// This behavior attaches by ID, so is only valid once on a page.
var form = $(context).find('#system-theme-settings .color-form').once('color');
- if (form.length == 0) {
+ if (form.length === 0) {
return;
}
var inputs = [];
@@ -43,7 +43,7 @@ Drupal.behaviors.color = {
// Add rows (or columns for horizontal gradients).
// Each gradient line should have a height (or width for horizontal
// gradients) of 10px (because we divided the height/width by 10 above).
- for (j = 0; j < (settings.gradients[i]['direction'] == 'vertical' ? height[i] : width[i]); ++j) {
+ for (j = 0; j < (settings.gradients[i]['direction'] === 'vertical' ? height[i] : width[i]); ++j) {
gradient.append('');
}
}
@@ -74,8 +74,8 @@ Drupal.behaviors.color = {
* This algorithm ensures relative ordering on the saturation and luminance
* axes is preserved, and performs a simple hue shift.
*
- * It is also symmetrical. If: shift_color(c, a, b) == d, then
- * shift_color(d, b, a) == c.
+ * It is also symmetrical. If: shift_color(c, a, b) === d, then
+ * shift_color(d, b, a) === c.
*/
function shift_color(given, ref1, ref2) {
// Convert to HSL.
@@ -85,7 +85,7 @@ Drupal.behaviors.color = {
given[0] += ref2[0] - ref1[0];
// Saturation: interpolate.
- if (ref1[1] == 0 || ref2[1] == 0) {
+ if (ref1[1] === 0 || ref2[1] === 0) {
given[1] = ref2[1];
}
else {
@@ -99,7 +99,7 @@ Drupal.behaviors.color = {
}
// Luminance: interpolate.
- if (ref1[2] == 0 || ref2[2] == 0) {
+ if (ref1[2] === 0 || ref2[2] === 0) {
given[2] = ref2[2];
}
else {
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index b22a282..ff17c1e 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -74,7 +74,7 @@ function _color_html_alter(&$vars) {
foreach ($color_paths as $color_path) {
// Color module currently requires unique file names to be used,
// which allows us to compare different file paths.
- if (drupal_basename($old_path) == drupal_basename($color_path)) {
+ if (drupal_basename($old_path) === drupal_basename($color_path)) {
// Replace the path to the new css file.
// This keeps the order of the stylesheets intact.
$vars['css'][$old_path]['data'] = $color_path;
@@ -163,7 +163,7 @@ function color_scheme_form($complete_form, &$form_state, $theme) {
// Note: we use the original theme when the default scheme is chosen.
$current_scheme = variable_get('color_' . $theme . '_palette', array());
foreach ($schemes as $key => $scheme) {
- if ($current_scheme == $scheme) {
+ if ($current_scheme === $scheme) {
$scheme_name = $key;
break;
}
@@ -340,7 +340,7 @@ function color_scheme_form_submit($form, &$form_state) {
}
// Don't render the default colorscheme, use the standard theme instead.
- if (implode(',', color_get_palette($theme, TRUE)) == implode(',', $palette)) {
+ if (implode(',', color_get_palette($theme, TRUE)) === implode(',', $palette)) {
variable_del('color_' . $theme . '_palette');
variable_del('color_' . $theme . '_stylesheets');
variable_del('color_' . $theme . '_logo');
@@ -524,7 +524,7 @@ function _color_render_images($theme, &$info, &$paths, $palette) {
// Render gradients.
foreach ($info['gradients'] as $gradient) {
// Get direction of the gradient.
- if (isset($gradient['direction']) && $gradient['direction'] == 'horizontal') {
+ if (isset($gradient['direction']) && $gradient['direction'] === 'horizontal') {
// Horizontal gradient.
for ($x = 0; $x < $gradient['dimension'][2]; $x++) {
$color = _color_blend($target, $palette[$gradient['colors'][0]], $palette[$gradient['colors'][1]], $x / ($gradient['dimension'][2] - 1));
@@ -553,7 +553,7 @@ function _color_render_images($theme, &$info, &$paths, $palette) {
$image = drupal_realpath($paths['target'] . $base);
// Cut out slice.
- if ($file == 'screenshot.png') {
+ if ($file === 'screenshot.png') {
$slice = imagecreatetruecolor(150, 90);
imagecopyresampled($slice, $target, 0, 0, $x, $y, 150, 90, $width, $height);
variable_set('color_' . $theme . '_screenshot', $image);
@@ -585,8 +585,8 @@ function _color_render_images($theme, &$info, &$paths, $palette) {
* Note: this function is significantly different from the JS version, as it
* is written to match the blended images perfectly.
*
- * Constraint: if (ref2 == target + (ref1 - target) * delta) for some fraction
- * delta then (return == target + (given - target) * delta).
+ * Constraint: if (ref2 === target + (ref1 - target) * delta) for some fraction
+ * delta then (return === target + (given - target) * delta).
*
* Loose constraint: Preserve relative positions in saturation and luminance
* space.
@@ -664,7 +664,7 @@ function _color_blend($img, $hex1, $hex2, $alpha) {
* Converts a hex color into an RGB triplet.
*/
function _color_unpack($hex, $normalize = FALSE) {
- if (strlen($hex) == 4) {
+ if (strlen($hex) === 4) {
$hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
}
$c = hexdec($hex);
@@ -735,9 +735,9 @@ function _color_rgb2hsl($rgb) {
$h = 0;
if ($delta > 0) {
- if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
- if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
- if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
+ if ($max === $r && $max != $g) $h += ($g - $b) / $delta;
+ if ($max === $g && $max != $b) $h += (2 + ($b - $r) / $delta);
+ if ($max === $b && $max != $r) $h += (4 + ($r - $g) / $delta);
$h /= 6;
}
diff --git a/core/modules/comment/comment.admin.inc b/core/modules/comment/comment.admin.inc
index d84b785..5701686 100644
--- a/core/modules/comment/comment.admin.inc
+++ b/core/modules/comment/comment.admin.inc
@@ -18,7 +18,7 @@
function comment_admin($type = 'new') {
$edit = $_POST;
- if (isset($edit['operation']) && ($edit['operation'] == 'delete') && isset($edit['comments']) && $edit['comments']) {
+ if (isset($edit['operation']) && ($edit['operation'] === 'delete') && isset($edit['comments']) && $edit['comments']) {
return drupal_get_form('comment_multiple_delete_confirm');
}
else {
@@ -46,7 +46,7 @@ function comment_admin_overview($form, &$form_state, $arg) {
'#attributes' => array('class' => array('container-inline')),
);
- if ($arg == 'approval') {
+ if ($arg === 'approval') {
$options['publish'] = t('Publish the selected comments');
}
else {
@@ -67,7 +67,7 @@ function comment_admin_overview($form, &$form_state, $arg) {
);
// Load the comments that need to be displayed.
- $status = ($arg == 'approval') ? COMMENT_NOT_PUBLISHED : COMMENT_PUBLISHED;
+ $status = ($arg === 'approval') ? COMMENT_NOT_PUBLISHED : COMMENT_PUBLISHED;
$header = array(
'subject' => array('data' => t('Subject'), 'field' => 'subject'),
'author' => array('data' => t('Author'), 'field' => 'name'),
@@ -154,7 +154,7 @@ function comment_admin_overview($form, &$form_state, $arg) {
function comment_admin_overview_validate($form, &$form_state) {
$form_state['values']['comments'] = array_diff($form_state['values']['comments'], array(0));
// We can't execute any 'Update options' if no comments were selected.
- if (count($form_state['values']['comments']) == 0) {
+ if (count($form_state['values']['comments']) === 0) {
form_set_error('', t('Select one or more comments to perform the update on.'));
}
}
@@ -171,17 +171,17 @@ function comment_admin_overview_submit($form, &$form_state) {
$operation = $form_state['values']['operation'];
$cids = $form_state['values']['comments'];
- if ($operation == 'delete') {
+ if ($operation === 'delete') {
comment_delete_multiple($cids);
}
else {
foreach ($cids as $cid => $value) {
$comment = comment_load($value);
- if ($operation == 'unpublish') {
+ if ($operation === 'unpublish') {
$comment->status = COMMENT_NOT_PUBLISHED;
}
- elseif ($operation == 'publish') {
+ elseif ($operation === 'publish') {
$comment->status = COMMENT_PUBLISHED;
}
comment_save($comment);
diff --git a/core/modules/comment/comment.api.php b/core/modules/comment/comment.api.php
index eb9f34d..79a3119 100644
--- a/core/modules/comment/comment.api.php
+++ b/core/modules/comment/comment.api.php
@@ -96,7 +96,7 @@ function hook_comment_view(Comment $comment, $view_mode, $langcode) {
*/
function hook_comment_view_alter(&$build) {
// Check for the existence of a field added by another module.
- if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) {
+ if ($build['#view_mode'] === 'full' && isset($build['an_additional_field'])) {
// Change its weight.
$build['an_additional_field']['#weight'] = -10;
}
diff --git a/core/modules/comment/comment.entity.inc b/core/modules/comment/comment.entity.inc
index cb4d6d6..45919d3 100644
--- a/core/modules/comment/comment.entity.inc
+++ b/core/modules/comment/comment.entity.inc
@@ -148,7 +148,7 @@ class CommentStorageController extends EntityDatabaseStorageController {
// Allow calling code to set thread itself.
$thread = $comment->thread;
}
- elseif ($comment->pid == 0) {
+ elseif ($comment->pid === 0) {
// This is a comment with no parent comment (depth 0): we start
// by retrieving the maximum thread level.
$max = db_query('SELECT MAX(thread) FROM {comment} WHERE nid = :nid', array(':nid' => $comment->nid))->fetchField();
@@ -174,7 +174,7 @@ class CommentStorageController extends EntityDatabaseStorageController {
':nid' => $comment->nid,
))->fetchField();
- if ($max == '') {
+ if ($max === '') {
// First child of this parent.
$thread = $parent->thread . '.' . comment_int_to_alphadecimal(0) . '/';
}
@@ -212,7 +212,7 @@ class CommentStorageController extends EntityDatabaseStorageController {
protected function postSave(EntityInterface $comment, $update) {
// Update the {node_comment_statistics} table prior to executing the hook.
$this->updateNodeStatistics($comment->nid);
- if ($comment->status == COMMENT_PUBLISHED) {
+ if ($comment->status === COMMENT_PUBLISHED) {
module_invoke_all('comment_publish', $comment);
}
}
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index a714419..c0afd4f 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -178,7 +178,7 @@ function comment_field_extra_fields() {
$return = array();
foreach (node_type_get_types() as $type) {
- if (variable_get('comment_subject_field_' . $type->type, 1) == 1) {
+ if (variable_get('comment_subject_field_' . $type->type, 1) === 1) {
$return['comment']['comment_node_' . $type->type] = array(
'form' => array(
'author' => array(
@@ -555,7 +555,7 @@ function comment_new_page_count($num_comments, $new_replies, $node) {
$mode = variable_get('comment_default_mode_' . $node->type, COMMENT_MODE_THREADED);
$comments_per_page = variable_get('comment_default_per_page_' . $node->type, 50);
$pagenum = NULL;
- $flat = $mode == COMMENT_MODE_FLAT ? TRUE : FALSE;
+ $flat = $mode === COMMENT_MODE_FLAT ? TRUE : FALSE;
if ($num_comments <= $comments_per_page) {
// Only one page of comments.
$pageno = 0;
@@ -633,14 +633,14 @@ function comment_node_view($node, $view_mode) {
$links = array();
if ($node->comment != COMMENT_NODE_HIDDEN) {
- if ($view_mode == 'rss') {
+ if ($view_mode === 'rss') {
// Add a comments RSS element which is a URL to the comments of this node.
$node->rss_elements[] = array(
'key' => 'comments',
'value' => url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE))
);
}
- elseif ($view_mode == 'teaser') {
+ elseif ($view_mode === 'teaser') {
// Teaser view: display the number of comments that have been posted,
// or a link to add new comments if the user has permission, the node
// is open to new comments, and there currently are none.
@@ -666,7 +666,7 @@ function comment_node_view($node, $view_mode) {
}
}
}
- if ($node->comment == COMMENT_NODE_OPEN) {
+ if ($node->comment === COMMENT_NODE_OPEN) {
$comment_form_location = variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW);
if (user_access('post comments')) {
$links['comment-add'] = array(
@@ -675,7 +675,7 @@ function comment_node_view($node, $view_mode) {
'attributes' => array('title' => t('Add a new comment to this page.')),
'fragment' => 'comment-form',
);
- if ($comment_form_location == COMMENT_FORM_SEPARATE_PAGE) {
+ if ($comment_form_location === COMMENT_FORM_SEPARATE_PAGE) {
$links['comment-add']['href'] = "comment/reply/$node->nid";
}
}
@@ -692,19 +692,19 @@ function comment_node_view($node, $view_mode) {
// allowed to post comments and if this node is allowing new comments.
// But we don't want this link if we're building the node for search
// indexing or constructing a search result excerpt.
- if ($node->comment == COMMENT_NODE_OPEN) {
+ if ($node->comment === COMMENT_NODE_OPEN) {
$comment_form_location = variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW);
if (user_access('post comments')) {
// Show the "post comment" link if the form is on another page, or
// if there are existing comments that the link will skip past.
- if ($comment_form_location == COMMENT_FORM_SEPARATE_PAGE || (!empty($node->comment_count) && user_access('access comments'))) {
+ if ($comment_form_location === COMMENT_FORM_SEPARATE_PAGE || (!empty($node->comment_count) && user_access('access comments'))) {
$links['comment-add'] = array(
'title' => t('Add new comment'),
'attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')),
'href' => "node/$node->nid",
'fragment' => 'comment-form',
);
- if ($comment_form_location == COMMENT_FORM_SEPARATE_PAGE) {
+ if ($comment_form_location === COMMENT_FORM_SEPARATE_PAGE) {
$links['comment-add']['href'] = "comment/reply/$node->nid";
}
}
@@ -728,7 +728,7 @@ function comment_node_view($node, $view_mode) {
// page. We compare $node and $page_node to ensure that comments are not
// appended to other nodes shown on the page, for example a node_reference
// displayed in 'full' view mode within another node.
- if ($node->comment && $view_mode == 'full' && node_is_page($node) && empty($node->in_preview)) {
+ if ($node->comment && $view_mode === 'full' && node_is_page($node) && empty($node->in_preview)) {
$node->content['comments'] = comment_node_page_additions($node);
}
}
@@ -763,7 +763,7 @@ function comment_node_page_additions($node) {
}
// Append comment form if needed.
- if (user_access('post comments') && $node->comment == COMMENT_NODE_OPEN && (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) == COMMENT_FORM_BELOW)) {
+ if (user_access('post comments') && $node->comment === COMMENT_NODE_OPEN && (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) === COMMENT_FORM_BELOW)) {
$comment = entity_create('comment', array('nid' => $node->nid));
$additions['comment_form'] = drupal_get_form("comment_node_{$node->type}_form", $comment);
}
@@ -969,7 +969,7 @@ function comment_view(Comment $comment, $node, $view_mode = 'full', $langcode =
if (empty($comment->in_preview)) {
$prefix = '';
- $is_threaded = isset($comment->divs) && variable_get('comment_default_mode_' . $node->type, COMMENT_MODE_THREADED) == COMMENT_MODE_THREADED;
+ $is_threaded = isset($comment->divs) && variable_get('comment_default_mode_' . $node->type, COMMENT_MODE_THREADED) === COMMENT_MODE_THREADED;
// Add 'new' anchor if needed.
if (!empty($comment->first_new)) {
@@ -1058,7 +1058,7 @@ function comment_build_content(Comment $comment, $node, $view_mode = 'full', $la
*/
function comment_links(Comment $comment, $node) {
$links = array();
- if ($node->comment == COMMENT_NODE_OPEN) {
+ if ($node->comment === COMMENT_NODE_OPEN) {
if (user_access('administer comments') && user_access('post comments')) {
$links['comment-delete'] = array(
'title' => t('delete'),
@@ -1075,7 +1075,7 @@ function comment_links(Comment $comment, $node) {
'href' => "comment/reply/$comment->nid/$comment->cid",
'html' => TRUE,
);
- if ($comment->status == COMMENT_NOT_PUBLISHED) {
+ if ($comment->status === COMMENT_NOT_PUBLISHED) {
$links['comment-approve'] = array(
'title' => t('approve'),
'href' => "comment/$comment->cid/approve",
@@ -1239,7 +1239,7 @@ function comment_form_node_form_alter(&$form, $form_state) {
'#weight' => 30,
);
$comment_count = isset($node->nid) ? db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid', array(':nid' => $node->nid))->fetchField() : 0;
- $comment_settings = ($node->comment == COMMENT_NODE_HIDDEN && empty($comment_count)) ? COMMENT_NODE_CLOSED : $node->comment;
+ $comment_settings = ($node->comment === COMMENT_NODE_HIDDEN && empty($comment_count)) ? COMMENT_NODE_CLOSED : $node->comment;
$form['comment_settings']['comment'] = array(
'#type' => 'radios',
'#title' => t('Comments'),
@@ -1459,8 +1459,8 @@ function comment_user_predelete($account) {
function comment_access($op, Comment $comment) {
global $user;
- if ($op == 'edit') {
- return ($user->uid && $user->uid == $comment->uid && $comment->status == COMMENT_PUBLISHED && user_access('edit own comments')) || user_access('administer comments');
+ if ($op === 'edit') {
+ return ($user->uid && $user->uid === $comment->uid && $comment->status === COMMENT_PUBLISHED && user_access('edit own comments')) || user_access('administer comments');
}
}
@@ -1604,7 +1604,7 @@ function comment_get_display_ordinal($cid, $node_type) {
}
$mode = variable_get('comment_default_mode_' . $node_type, COMMENT_MODE_THREADED);
- if ($mode == COMMENT_MODE_FLAT) {
+ if ($mode === COMMENT_MODE_FLAT) {
// For flat comments, cid is used for ordering comments due to
// unpredicatable behavior with timestamp, so we make the same assumption
// here.
@@ -1773,7 +1773,7 @@ function comment_form($form, &$form_state, Comment $comment) {
'#type' => 'textfield',
'#title' => t('Your name'),
'#default_value' => $author,
- '#required' => (!$user->uid && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT),
+ '#required' => (!$user->uid && $anonymous_contact === COMMENT_ANONYMOUS_MUST_CONTACT),
'#maxlength' => 60,
'#size' => 30,
);
@@ -1784,7 +1784,7 @@ function comment_form($form, &$form_state, Comment $comment) {
'#type' => 'email',
'#title' => t('E-mail'),
'#default_value' => $comment->mail,
- '#required' => (!$user->uid && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT),
+ '#required' => (!$user->uid && $anonymous_contact === COMMENT_ANONYMOUS_MUST_CONTACT),
'#maxlength' => 64,
'#size' => 30,
'#description' => t('The content of this field is kept private and will not be shown publicly.'),
@@ -1824,7 +1824,7 @@ function comment_form($form, &$form_state, Comment $comment) {
'#title' => t('Subject'),
'#maxlength' => 64,
'#default_value' => $comment->subject,
- '#access' => variable_get('comment_subject_field_' . $node->type, 1) == 1,
+ '#access' => variable_get('comment_subject_field_' . $node->type, 1) === 1,
'#weight' => -1,
);
@@ -1843,7 +1843,7 @@ function comment_form($form, &$form_state, Comment $comment) {
// If a content type has multilingual support we set the comment to inherit the
// content language. Otherwise mark the comment as language neutral.
$comment_langcode = $comment->langcode;
- if (($comment_langcode == LANGUAGE_NOT_SPECIFIED) && variable_get('node_type_language_' . $node->type, 0)) {
+ if (($comment_langcode === LANGUAGE_NOT_SPECIFIED) && variable_get('node_type_language_' . $node->type, 0)) {
$comment_langcode = $language_content->langcode;
}
$form['langcode'] = array(
@@ -2011,7 +2011,7 @@ function comment_submit(Comment $comment) {
}
// Validate the comment's subject. If not specified, extract from comment body.
- if (trim($comment->subject) == '') {
+ if (trim($comment->subject) === '') {
// The body may be in any format, so:
// 1) Filter it into HTML
// 2) Strip out all HTML tags
@@ -2026,7 +2026,7 @@ function comment_submit(Comment $comment) {
$comment->subject = truncate_utf8(trim(decode_entities(strip_tags($comment_text))), 29, TRUE);
// Edge cases where the comment body is populated only by HTML tags will
// require a default subject.
- if ($comment->subject == '') {
+ if ($comment->subject === '') {
$comment->subject = t('(No subject)');
}
}
@@ -2062,7 +2062,7 @@ function comment_form_submit_build_comment($form, &$form_state) {
function comment_form_submit($form, &$form_state) {
$node = node_load($form_state['values']['nid']);
$comment = comment_form_submit_build_comment($form, $form_state);
- if (user_access('post comments') && (user_access('administer comments') || $node->comment == COMMENT_NODE_OPEN)) {
+ if (user_access('post comments') && (user_access('administer comments') || $node->comment === COMMENT_NODE_OPEN)) {
// Save the anonymous user information to a cookie for reuse.
if (user_is_anonymous()) {
user_cookie_save(array_intersect_key($form_state['values'], array_flip(array('name', 'mail', 'homepage'))));
@@ -2075,7 +2075,7 @@ function comment_form_submit($form, &$form_state) {
watchdog('content', 'Comment posted: %subject.', array('%subject' => $comment->subject), WATCHDOG_NOTICE, l(t('view'), 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)));
// Explain the approval queue if necessary.
- if ($comment->status == COMMENT_NOT_PUBLISHED) {
+ if ($comment->status === COMMENT_NOT_PUBLISHED) {
if (!user_access('administer comments')) {
drupal_set_message(t('Your comment has been queued for review by site administrators and will be published after approval.'));
}
@@ -2108,7 +2108,7 @@ function comment_form_submit($form, &$form_state) {
* Implements hook_preprocess_block().
*/
function comment_preprocess_block(&$variables) {
- if ($variables['block']->module == 'comment') {
+ if ($variables['block']->module === 'comment') {
$variables['attributes_array']['role'] = 'navigation';
}
}
@@ -2151,7 +2151,7 @@ function template_preprocess_comment(&$variables) {
$variables['status'] = 'preview';
}
else {
- $variables['status'] = ($comment->status == COMMENT_NOT_PUBLISHED) ? 'unpublished' : 'published';
+ $variables['status'] = ($comment->status === COMMENT_NOT_PUBLISHED) ? 'unpublished' : 'published';
}
// Gather comment classes.
@@ -2166,10 +2166,10 @@ function template_preprocess_comment(&$variables) {
$variables['classes_array'][] = 'by-anonymous';
}
else {
- if ($comment->uid == $variables['node']->uid) {
+ if ($comment->uid === $variables['node']->uid) {
$variables['classes_array'][] = 'by-node-author';
}
- if ($comment->uid == $variables['user']->uid) {
+ if ($comment->uid === $variables['user']->uid) {
$variables['classes_array'][] = 'by-viewer';
}
}
@@ -2203,7 +2203,7 @@ function theme_comment_post_forbidden($variables) {
if ($authenticated_post_comments) {
// We cannot use drupal_get_destination() because these links
// sometimes appear on /node and taxonomy listing pages.
- if (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) == COMMENT_FORM_SEPARATE_PAGE) {
+ if (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) === COMMENT_FORM_SEPARATE_PAGE) {
$destination = array('destination' => "comment/reply/$node->nid#comment-form");
}
else {
@@ -2514,8 +2514,8 @@ function comment_rdf_mapping() {
* Implements hook_file_download_access().
*/
function comment_file_download_access($field, $entity_type, $entity) {
- if ($entity_type == 'comment') {
- if (user_access('access comments') && $entity->status == COMMENT_PUBLISHED || user_access('administer comments')) {
+ if ($entity_type === 'comment') {
+ if (user_access('access comments') && $entity->status === COMMENT_PUBLISHED || user_access('administer comments')) {
$node = node_load($entity->nid);
return node_access('view', $node);
}
diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc
index 21fe465..965072c 100644
--- a/core/modules/comment/comment.pages.inc
+++ b/core/modules/comment/comment.pages.inc
@@ -33,7 +33,7 @@ function comment_reply($node, $pid = NULL) {
$build = array();
// The user is previewing a comment prior to submitting it.
- if ($op == t('Preview')) {
+ if ($op === t('Preview')) {
if (user_access('post comments')) {
$comment = entity_create('comment', array('nid' => $node->nid, 'pid' => $pid));
$build['comment_form'] = drupal_get_form("comment_node_{$node->type}_form", $comment);
diff --git a/core/modules/comment/comment.test b/core/modules/comment/comment.test
index 259e420..cebd6e3 100644
--- a/core/modules/comment/comment.test
+++ b/core/modules/comment/comment.test
@@ -46,7 +46,7 @@ class CommentHelperCase extends DrupalWebTestCase {
$this->drupalGet('comment/reply/' . $node->nid);
}
- if ($subject_mode == TRUE) {
+ if ($subject_mode === TRUE) {
$edit['subject'] = $subject;
}
else {
@@ -239,7 +239,7 @@ class CommentHelperCase extends DrupalWebTestCase {
$edit['comments[' . $comment->id . ']'] = TRUE;
$this->drupalPost('admin/content/comment' . ($approval ? '/approval' : ''), $edit, t('Update'));
- if ($operation == 'delete') {
+ if ($operation === 'delete') {
$this->drupalPost(NULL, array(), t('Delete comments'));
$this->assertRaw(format_plural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), t('Operation "' . $operation . '" was performed on comment.'));
}
@@ -324,7 +324,7 @@ class CommentInterfaceTest extends CommentHelperCase {
$this->drupalGet('comment/' . $comment->id . '/edit');
$comment = $this->postComment(NULL, $comment->comment, $comment->subject, array('name' => ''));
$comment_loaded = comment_load($comment->id);
- $this->assertTrue(empty($comment_loaded->name) && $comment_loaded->uid == 0, t('Comment author successfully changed to anonymous.'));
+ $this->assertTrue(empty($comment_loaded->name) && $comment_loaded->uid === 0, t('Comment author successfully changed to anonymous.'));
// Test changing the comment author to an unverified user.
$random_name = $this->randomName();
@@ -337,7 +337,7 @@ class CommentInterfaceTest extends CommentHelperCase {
$this->drupalGet('comment/' . $comment->id . '/edit');
$comment = $this->postComment(NULL, $comment->comment, $comment->subject, array('name' => $this->web_user->name));
$comment_loaded = comment_load($comment->id);
- $this->assertTrue($comment_loaded->name == $this->web_user->name && $comment_loaded->uid == $this->web_user->uid, t('Comment author successfully changed to a registered user.'));
+ $this->assertTrue($comment_loaded->name === $this->web_user->name && $comment_loaded->uid === $this->web_user->uid, t('Comment author successfully changed to a registered user.'));
$this->drupalLogout();
@@ -440,7 +440,7 @@ class CommentInterfaceTest extends CommentHelperCase {
$this->assertNoLink(t('@count new comments', array('@count' => 0)));
$this->assertLink(t('Read more'));
$count = $this->xpath('//div[@id=:id]/div[@class=:class]/ul/li', array(':id' => 'node-' . $this->node->nid, ':class' => 'link-wrapper'));
- $this->assertTrue(count($count) == 1, t('One child found'));
+ $this->assertTrue(count($count) === 1, t('One child found'));
// Create a new comment. This helper function may be run with different
// comment settings so use comment_save() to avoid complex setup.
@@ -474,7 +474,7 @@ class CommentInterfaceTest extends CommentHelperCase {
$this->assertNoLink(t('1 new comment'));
$this->assertNoLink(t('@count new comments', array('@count' => 0)));
$count = $this->xpath('//div[@id=:id]/div[@class=:class]/ul/li', array(':id' => 'node-' . $this->node->nid, ':class' => 'link-wrapper'));
- $this->assertTrue(count($count) == 2, print_r($count, TRUE));
+ $this->assertTrue(count($count) === 2, print_r($count, TRUE));
}
/**
@@ -526,11 +526,11 @@ class CommentInterfaceTest extends CommentHelperCase {
$this->drupalGet('node/' . $node->nid);
// Verify classes if the comment is visible for the current user.
- if ($case['comment_status'] == COMMENT_PUBLISHED || $case['user'] == 'admin') {
+ if ($case['comment_status'] === COMMENT_PUBLISHED || $case['user'] === 'admin') {
// Verify the by-anonymous class.
$comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-anonymous")]');
- if ($case['comment_uid'] == 0) {
- $this->assertTrue(count($comments) == 1, 'by-anonymous class found.');
+ if ($case['comment_uid'] === 0) {
+ $this->assertTrue(count($comments) === 1, 'by-anonymous class found.');
}
else {
$this->assertFalse(count($comments), 'by-anonymous class not found.');
@@ -538,8 +538,8 @@ class CommentInterfaceTest extends CommentHelperCase {
// Verify the by-node-author class.
$comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-node-author")]');
- if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['node_uid']) {
- $this->assertTrue(count($comments) == 1, 'by-node-author class found.');
+ if ($case['comment_uid'] > 0 && $case['comment_uid'] === $case['node_uid']) {
+ $this->assertTrue(count($comments) === 1, 'by-node-author class found.');
}
else {
$this->assertFalse(count($comments), 'by-node-author class not found.');
@@ -547,8 +547,8 @@ class CommentInterfaceTest extends CommentHelperCase {
// Verify the by-viewer class.
$comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-viewer")]');
- if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['user_uid']) {
- $this->assertTrue(count($comments) == 1, 'by-viewer class found.');
+ if ($case['comment_uid'] > 0 && $case['comment_uid'] === $case['user_uid']) {
+ $this->assertTrue(count($comments) === 1, 'by-viewer class found.');
}
else {
$this->assertFalse(count($comments), 'by-viewer class not found.');
@@ -557,18 +557,18 @@ class CommentInterfaceTest extends CommentHelperCase {
// Verify the unpublished class.
$comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "unpublished")]');
- if ($case['comment_status'] == COMMENT_NOT_PUBLISHED && $case['user'] == 'admin') {
- $this->assertTrue(count($comments) == 1, 'unpublished class found.');
+ if ($case['comment_status'] === COMMENT_NOT_PUBLISHED && $case['user'] === 'admin') {
+ $this->assertTrue(count($comments) === 1, 'unpublished class found.');
}
else {
$this->assertFalse(count($comments), 'unpublished class not found.');
}
// Verify the new class.
- if ($case['comment_status'] == COMMENT_PUBLISHED || $case['user'] == 'admin') {
+ if ($case['comment_status'] === COMMENT_PUBLISHED || $case['user'] === 'admin') {
$comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "new")]');
if ($case['user'] != 'anonymous') {
- $this->assertTrue(count($comments) == 1, 'new class found.');
+ $this->assertTrue(count($comments) === 1, 'new class found.');
// Request the node again. The new class should disappear.
$this->drupalGet('node/' . $node->nid);
@@ -861,7 +861,7 @@ class CommentInterfaceTest extends CommentHelperCase {
// User is allowed to view comments.
if ($info['access comments']) {
- if ($path == '') {
+ if ($path === '') {
// In teaser view, a link containing the comment count is always
// expected.
if ($info['comment count']) {
@@ -884,7 +884,7 @@ class CommentInterfaceTest extends CommentHelperCase {
// comment_num_new() is based on node views, so comments are marked as
// read when a node is viewed, regardless of whether we have access to
// comments.
- if ($path == "node/$nid" && $this->loggedInUser && isset($this->comment)) {
+ if ($path === "node/$nid" && $this->loggedInUser && isset($this->comment)) {
$this->comment->seen = TRUE;
}
@@ -917,7 +917,7 @@ class CommentInterfaceTest extends CommentHelperCase {
// "Add new comment" is always expected, except when there are no
// comments or if the user cannot see them.
- if ($path == "node/$nid" && $info['form'] == COMMENT_FORM_BELOW && (!$info['comment count'] || !$info['access comments'])) {
+ if ($path === "node/$nid" && $info['form'] === COMMENT_FORM_BELOW && (!$info['comment count'] || !$info['access comments'])) {
$this->assertNoLink('Add new comment');
}
else {
@@ -925,7 +925,7 @@ class CommentInterfaceTest extends CommentHelperCase {
// Verify that the "Add new comment" link points to the correct URL
// based on the comment form location configuration.
- if ($info['form'] == COMMENT_FORM_SEPARATE_PAGE) {
+ if ($info['form'] === COMMENT_FORM_SEPARATE_PAGE) {
$this->assertLinkByHref("comment/reply/$nid#comment-form", 0, 'Comment form link destination is on a separate page.');
$this->assertNoLinkByHref("node/$nid#comment-form");
}
@@ -937,9 +937,9 @@ class CommentInterfaceTest extends CommentHelperCase {
// Also verify that the comment form appears according to the configured
// location.
- if ($path == "node/$nid") {
+ if ($path === "node/$nid") {
$elements = $this->xpath('//form[@id=:id]', array(':id' => 'comment-form'));
- if ($info['form'] == COMMENT_FORM_BELOW) {
+ if ($info['form'] === COMMENT_FORM_BELOW) {
$this->assertTrue(count($elements), t('Comment form found below.'));
}
else {
diff --git a/core/modules/comment/comment.tokens.inc b/core/modules/comment/comment.tokens.inc
index 1c6a7ee..accd04c 100644
--- a/core/modules/comment/comment.tokens.inc
+++ b/core/modules/comment/comment.tokens.inc
@@ -115,7 +115,7 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
$replacements = array();
- if ($type == 'comment' && !empty($data['comment'])) {
+ if ($type === 'comment' && !empty($data['comment'])) {
$comment = $data['comment'];
foreach ($tokens as $name => $original) {
@@ -131,7 +131,7 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
break;
case 'name':
- $name = ($comment->uid == 0) ? variable_get('anonymous', t('Anonymous')) : $comment->name;
+ $name = ($comment->uid === 0) ? variable_get('anonymous', t('Anonymous')) : $comment->name;
$replacements[$original] = $sanitize ? filter_xss($name) : $name;
break;
@@ -223,7 +223,7 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
$replacements += token_generate('user', $author_tokens, array('user' => $account), $options);
}
}
- elseif ($type == 'node' & !empty($data['node'])) {
+ elseif ($type === 'node' & !empty($data['node'])) {
$node = $data['node'];
foreach ($tokens as $name => $original) {
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 89ce0bc..ea8d5dd 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -128,7 +128,7 @@ function _contact_personal_tab_access($account) {
}
// Users may not contact themselves.
- if ($user->uid == $account->uid) {
+ if ($user->uid === $account->uid) {
return FALSE;
}
diff --git a/core/modules/dashboard/dashboard.js b/core/modules/dashboard/dashboard.js
index 39d87c2..8b584a6 100644
--- a/core/modules/dashboard/dashboard.js
+++ b/core/modules/dashboard/dashboard.js
@@ -25,7 +25,7 @@ Drupal.behaviors.dashboard = {
var $this = $(this);
var empty_text = "";
// If the region is empty
- if ($this.find('.block').length == 0) {
+ if ($this.find('.block').length === 0) {
// Check if we are in customize mode and grab the correct empty text
if ($('#dashboard').hasClass('customize-mode')) {
empty_text = Drupal.settings.dashboard.emptyRegionTextActive;
@@ -33,7 +33,7 @@ Drupal.behaviors.dashboard = {
empty_text = Drupal.settings.dashboard.emptyRegionTextInactive;
}
// We need a placeholder.
- if ($this.find('.placeholder').length == 0) {
+ if ($this.find('.placeholder').length === 0) {
$this.append('');
}
$this.find('.placeholder').html(empty_text);
diff --git a/core/modules/dashboard/dashboard.module b/core/modules/dashboard/dashboard.module
index 889af83..d4f9596 100644
--- a/core/modules/dashboard/dashboard.module
+++ b/core/modules/dashboard/dashboard.module
@@ -101,12 +101,12 @@ function dashboard_permission() {
*/
function dashboard_block_info_alter(&$blocks, $theme, $code_blocks) {
$admin_theme = variable_get('admin_theme');
- if (($admin_theme && $theme == $admin_theme) || (!$admin_theme && $theme == variable_get('theme_default', 'stark'))) {
+ if (($admin_theme && $theme === $admin_theme) || (!$admin_theme && $theme === variable_get('theme_default', 'stark'))) {
foreach ($blocks as $module => &$module_blocks) {
foreach ($module_blocks as $delta => &$block) {
// Make administrative blocks that are not already in use elsewhere
// available for the dashboard.
- if (empty($block['status']) && (empty($block['region']) || $block['region'] == BLOCK_REGION_NONE) && !empty($code_blocks[$module][$delta]['properties']['administrative'])) {
+ if (empty($block['status']) && (empty($block['region']) || $block['region'] === BLOCK_REGION_NONE) && !empty($code_blocks[$module][$delta]['properties']['administrative'])) {
$block['status'] = 1;
$block['region'] = 'dashboard_inactive';
}
@@ -148,7 +148,7 @@ function dashboard_page_build(&$page) {
$page['content']['dashboard'] = array('#theme_wrappers' => array('dashboard'));
foreach (dashboard_regions() as $region) {
// Do not show dashboard blocks that are disabled.
- if ($region == 'dashboard_inactive') {
+ if ($region === 'dashboard_inactive') {
continue;
}
// Insert regions even when they are empty, so that they will be
@@ -206,7 +206,7 @@ function dashboard_page_build(&$page) {
* Add regions to each theme to store the dashboard blocks.
*/
function dashboard_system_info_alter(&$info, $file, $type) {
- if ($type == 'theme') {
+ if ($type === 'theme') {
// Add the dashboard regions (the "inactive" region should always appear
// last in the list, for usability reasons).
$dashboard_regions = dashboard_region_descriptions();
@@ -366,7 +366,7 @@ function dashboard_form_block_admin_display_form_alter(&$form, &$form_state, $fo
// 'dashboard_inactive' region, because dashboard_block_info_alter() is
// called when the blocks are rehashed. Fortunately, this is the exact
// behavior we want.
- if ($block['region']['#default_value'] == 'dashboard_inactive') {
+ if ($block['region']['#default_value'] === 'dashboard_inactive') {
// @todo These do not wind up in correct alphabetical order.
$block['region']['#default_value'] = NULL;
}
@@ -456,7 +456,7 @@ function dashboard_is_visible() {
// the dashboard, and if the current user has access to see it, return
// TRUE.
$menu_item = menu_get_item();
- $is_visible = isset($menu_item['page_callback']) && $menu_item['page_callback'] == 'dashboard_admin' && !empty($menu_item['access']);
+ $is_visible = isset($menu_item['page_callback']) && $menu_item['page_callback'] === 'dashboard_admin' && !empty($menu_item['access']);
}
return $is_visible;
}
@@ -554,7 +554,7 @@ function dashboard_update() {
if (!empty($_REQUEST['form_token']) && drupal_valid_token($_REQUEST['form_token'], 'dashboard-update')) {
parse_str($_REQUEST['regions'], $regions);
foreach ($regions as $region_name => $blocks) {
- if ($region_name == 'disabled_blocks') {
+ if ($region_name === 'disabled_blocks') {
$region_name = 'dashboard_inactive';
}
foreach ($blocks as $weight => $block_string) {
diff --git a/core/modules/dashboard/dashboard.test b/core/modules/dashboard/dashboard.test
index ff37d57..faa4906 100644
--- a/core/modules/dashboard/dashboard.test
+++ b/core/modules/dashboard/dashboard.test
@@ -148,7 +148,7 @@ class DashboardBlockAvailabilityTestCase extends DrupalWebTestCase {
$this->assertNoText(t('Syndicate'), t('Drawer of disabled blocks excludes a block not defined as "administrative".'));
$this->drupalGet('admin/dashboard/configure');
$elements = $this->xpath('//select[@id=:id]//option[@selected="selected"]', array(':id' => 'edit-blocks-comment-recent-region'));
- $this->assertTrue($elements[0]['value'] == 'dashboard_inactive', t('A block defined as "administrative" defaults to dashboard_inactive.'));
+ $this->assertTrue($elements[0]['value'] === 'dashboard_inactive', t('A block defined as "administrative" defaults to dashboard_inactive.'));
// Now enable the block on the dashboard.
$values = array();
diff --git a/core/modules/dblog/dblog.admin.inc b/core/modules/dblog/dblog.admin.inc
index b2da7ed..9859011 100644
--- a/core/modules/dblog/dblog.admin.inc
+++ b/core/modules/dblog/dblog.admin.inc
@@ -322,7 +322,7 @@ function dblog_filter_form($form) {
* Validate result from dblog administration filter form.
*/
function dblog_filter_form_validate($form, &$form_state) {
- if ($form_state['values']['op'] == t('Filter') && empty($form_state['values']['type']) && empty($form_state['values']['severity'])) {
+ if ($form_state['values']['op'] === t('Filter') && empty($form_state['values']['type']) && empty($form_state['values']['severity'])) {
form_set_error('type', t('You must select something to filter by.'));
}
}
diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module
index a43e0a5..e8050bf 100644
--- a/core/modules/dblog/dblog.module
+++ b/core/modules/dblog/dblog.module
@@ -89,7 +89,7 @@ function dblog_menu() {
* Implements hook_init().
*/
function dblog_init() {
- if (arg(0) == 'admin' && arg(1) == 'reports') {
+ if (arg(0) === 'admin' && arg(1) === 'reports') {
// Add the CSS for this module
drupal_add_css(drupal_get_path('module', 'dblog') . '/dblog.css');
}
diff --git a/core/modules/dblog/dblog.test b/core/modules/dblog/dblog.test
index 77765d7..078b037 100644
--- a/core/modules/dblog/dblog.test
+++ b/core/modules/dblog/dblog.test
@@ -61,10 +61,10 @@ class DBLogTestCase extends DrupalWebTestCase {
// Check row limit variable.
$current_limit = variable_get('dblog_row_limit', 1000);
- $this->assertTrue($current_limit == $row_limit, t('[Cache] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
+ $this->assertTrue($current_limit === $row_limit, t('[Cache] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
// Verify dblog row limit equals specified row limit.
$current_limit = unserialize(db_query("SELECT value FROM {variable} WHERE name = :dblog_limit", array(':dblog_limit' => 'dblog_row_limit'))->fetchField());
- $this->assertTrue($current_limit == $row_limit, t('[Variable table] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
+ $this->assertTrue($current_limit === $row_limit, t('[Variable table] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
}
/**
@@ -83,7 +83,7 @@ class DBLogTestCase extends DrupalWebTestCase {
$this->cronRun();
// Verify dblog row count equals row limit plus one because cron adds a record after it runs.
$count = db_query('SELECT COUNT(wid) FROM {watchdog}')->fetchField();
- $this->assertTrue($count == $row_limit + 1, t('Dblog row count of @count equals row limit of @limit plus one', array('@count' => $count, '@limit' => $row_limit)));
+ $this->assertTrue($count === $row_limit + 1, t('Dblog row count of @count equals row limit of @limit plus one', array('@count' => $count, '@limit' => $row_limit)));
}
/**
@@ -131,35 +131,35 @@ class DBLogTestCase extends DrupalWebTestCase {
// View dblog help node.
$this->drupalGet('admin/help/dblog');
$this->assertResponse($response);
- if ($response == 200) {
+ if ($response === 200) {
$this->assertText(t('Database Logging'), t('DBLog help was displayed'));
}
// View dblog report node.
$this->drupalGet('admin/reports/dblog');
$this->assertResponse($response);
- if ($response == 200) {
+ if ($response === 200) {
$this->assertText(t('Recent log messages'), t('DBLog report was displayed'));
}
// View dblog page-not-found report node.
$this->drupalGet('admin/reports/page-not-found');
$this->assertResponse($response);
- if ($response == 200) {
+ if ($response === 200) {
$this->assertText(t('Top ' . $quote . 'page not found' . $quote . ' errors'), t('DBLog page-not-found report was displayed'));
}
// View dblog access-denied report node.
$this->drupalGet('admin/reports/access-denied');
$this->assertResponse($response);
- if ($response == 200) {
+ if ($response === 200) {
$this->assertText(t('Top ' . $quote . 'access denied' . $quote . ' errors'), t('DBLog access-denied report was displayed'));
}
// View dblog event node.
$this->drupalGet('admin/reports/event/1');
$this->assertResponse($response);
- if ($response == 200) {
+ if ($response === 200) {
$this->assertText(t('Details'), t('DBLog event node was displayed'));
}
}
@@ -239,7 +239,7 @@ class DBLogTestCase extends DrupalWebTestCase {
// Found link with the message text.
$links = array_shift($links);
foreach ($links->attributes() as $attr => $value) {
- if ($attr == 'href') {
+ if ($attr === 'href') {
// Extract link to details page.
$link = drupal_substr($value, strpos($value, 'admin/reports/event/'));
$this->drupalGet($link);
@@ -453,7 +453,7 @@ class DBLogTestCase extends DrupalWebTestCase {
// Count the number of entries of this type.
$type_count = 0;
foreach ($types as $type) {
- if ($type['type'] == $type_name) {
+ if ($type['type'] === $type_name) {
$type_count += $type['count'];
}
}
@@ -515,7 +515,7 @@ class DBLogTestCase extends DrupalWebTestCase {
$count = array_fill(0, count($types), 0);
foreach ($entries as $entry) {
foreach ($types as $key => $type) {
- if ($entry['type'] == $type['type'] && $entry['severity'] == $type['severity']) {
+ if ($entry['type'] === $type['type'] && $entry['severity'] === $type['severity']) {
$count[$key]++;
break;
}
diff --git a/core/modules/entity/entity.api.php b/core/modules/entity/entity.api.php
index e983778..8450a29 100644
--- a/core/modules/entity/entity.api.php
+++ b/core/modules/entity/entity.api.php
@@ -414,7 +414,7 @@ function hook_entity_view($entity, $type, $view_mode, $langcode) {
* @see hook_user_view_alter()
*/
function hook_entity_view_alter(&$build, $type) {
- if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) {
+ if ($build['#view_mode'] === 'full' && isset($build['an_additional_field'])) {
// Change its weight.
$build['an_additional_field']['#weight'] = -10;
@@ -437,7 +437,7 @@ function hook_entity_view_alter(&$build, $type) {
*/
function hook_entity_prepare_view($entities, $type) {
// Load a specific node into the user object for later theming.
- if ($type == 'user') {
+ if ($type === 'user') {
$nodes = mymodule_get_user_nodes(array_keys($entities));
foreach ($entities as $uid => $entity) {
$entity->user_node = $nodes[$uid];
diff --git a/core/modules/entity/entity.query.inc b/core/modules/entity/entity.query.inc
index f854369..b4a1e28 100644
--- a/core/modules/entity/entity.query.inc
+++ b/core/modules/entity/entity.query.inc
@@ -610,8 +610,8 @@ class EntityFieldQuery {
$order = tablesort_get_order($headers);
$direction = tablesort_get_sort($headers);
foreach ($headers as $header) {
- if (is_array($header) && ($header['data'] == $order['name'])) {
- if ($header['type'] == 'field') {
+ if (is_array($header) && ($header['data'] === $order['name'])) {
+ if ($header['type'] === 'field') {
$this->fieldOrderBy($header['specifier']['field'], $header['specifier']['column'], $direction);
}
else {
@@ -855,14 +855,14 @@ class EntityFieldQuery {
// Order the query.
foreach ($this->order as $order) {
- if ($order['type'] == 'entity') {
+ if ($order['type'] === 'entity') {
$key = $order['specifier'];
if (!isset($id_map[$key])) {
throw new EntityFieldQueryException(t('Do not know how to order on @key for @entity_type', array('@key' => $key, '@entity_type' => $entity_type)));
}
$select_query->orderBy($id_map[$key], $order['direction']);
}
- elseif ($order['type'] == 'property') {
+ elseif ($order['type'] === 'property') {
$select_query->orderBy("$base_table." . $order['specifier'], $order['direction']);
}
}
diff --git a/core/modules/entity/tests/entity_crud_hook_test.test b/core/modules/entity/tests/entity_crud_hook_test.test
index be59e99..949ab7f 100644
--- a/core/modules/entity/tests/entity_crud_hook_test.test
+++ b/core/modules/entity/tests/entity_crud_hook_test.test
@@ -55,7 +55,7 @@ class EntityCrudHookTestCase extends DrupalWebTestCase {
// Sort the positions and ensure they remain in the same order.
$sorted = $positions;
sort($sorted);
- $this->assertTrue($sorted == $positions, 'The hook messages appear in the correct order.');
+ $this->assertTrue($sorted === $positions, 'The hook messages appear in the correct order.');
}
/**
diff --git a/core/modules/entity/tests/entity_query.test b/core/modules/entity/tests/entity_query.test
index fb5dc14..f9d9ea0 100644
--- a/core/modules/entity/tests/entity_query.test
+++ b/core/modules/entity/tests/entity_query.test
@@ -1043,7 +1043,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
$query->execute();
}
catch (EntityFieldQueryException $exception) {
- $pass = ($exception->getMessage() == t('For this query an entity type must be specified.'));
+ $pass = ($exception->getMessage() === t('For this query an entity type must be specified.'));
}
$this->assertTrue($pass, t("Can't query the universe."));
}
@@ -1262,7 +1262,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
$query->queryCallback();
}
catch (EntityFieldQueryException $exception) {
- $pass = ($exception->getMessage() == t("Can't handle more than one field storage engine"));
+ $pass = ($exception->getMessage() === t("Can't handle more than one field storage engine"));
}
$this->assertTrue($pass, t('Cannot query across field storage engines.'));
}
diff --git a/core/modules/entity/tests/modules/entity_cache_test/entity_cache_test.module b/core/modules/entity/tests/modules/entity_cache_test/entity_cache_test.module
index 5ae9ecc..a9dbcd6 100644
--- a/core/modules/entity/tests/modules/entity_cache_test/entity_cache_test.module
+++ b/core/modules/entity/tests/modules/entity_cache_test/entity_cache_test.module
@@ -18,7 +18,7 @@
* @see entity_cache_test_dependency_entity_info()
*/
function entity_cache_test_watchdog($log_entry) {
- if ($log_entry['type'] == 'system' && $log_entry['message'] == '%module module installed.') {
+ if ($log_entry['type'] === 'system' && $log_entry['message'] === '%module module installed.') {
$info = entity_get_info('entity_cache_test');
// Store the information in a system variable to analyze it later in the
// test case.
diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index d9061e1..bd6f15e 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -219,7 +219,7 @@ function hook_field_info_alter(&$info) {
* definitions.
*/
function hook_field_schema($field) {
- if ($field['type'] == 'text_long') {
+ if ($field['type'] === 'text_long') {
$columns = array(
'value' => array(
'type' => 'text',
@@ -302,7 +302,7 @@ function hook_field_load($entity_type, $entities, $field, $instances, $langcode,
// by formatters if needed.
if (empty($instances[$id]['settings']['text_processing']) || filter_format_allowcache($item['format'])) {
$items[$id][$delta]['safe_value'] = isset($item['value']) ? _text_sanitize($instances[$id], $langcode, $item, 'value') : '';
- if ($field['type'] == 'text_with_summary') {
+ if ($field['type'] === 'text_with_summary') {
$items[$id][$delta]['safe_summary'] = isset($item['summary']) ? _text_sanitize($instances[$id], $langcode, $item, 'summary') : '';
}
}
@@ -414,7 +414,7 @@ function hook_field_validate($entity_type, $entity, $field, $instance, $langcode
* $entity->{$field['field_name']}[$langcode], or an empty array if unset.
*/
function hook_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
- if ($field['type'] == 'number_decimal') {
+ if ($field['type'] === 'number_decimal') {
// Let PHP round the value to ensure consistent behavior across storage
// backends.
foreach ($items as $delta => $item) {
@@ -452,7 +452,7 @@ function hook_field_presave($entity_type, $entity, $field, $instance, $langcode,
* @see hook_field_delete()
*/
function hook_field_insert($entity_type, $entity, $field, $instance, $langcode, &$items) {
- if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] == 'field_sql_storage' && $entity_type == 'node' && $entity->status) {
+ if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] === 'field_sql_storage' && $entity_type === 'node' && $entity->status) {
$query = db_insert('taxonomy_index')->fields(array('nid', 'tid', 'sticky', 'created', ));
foreach ($items as $item) {
$query->values(array(
@@ -493,7 +493,7 @@ function hook_field_insert($entity_type, $entity, $field, $instance, $langcode,
* @see hook_field_delete()
*/
function hook_field_update($entity_type, $entity, $field, $instance, $langcode, &$items) {
- if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] == 'field_sql_storage' && $entity_type == 'node') {
+ if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] === 'field_sql_storage' && $entity_type === 'node') {
$first_call = &drupal_static(__FUNCTION__, array());
// We don't maintain data for old revisions, so clear all previous values
@@ -896,7 +896,7 @@ function hook_field_widget_form(&$form, &$form_state, $field, $instance, $langco
*/
function hook_field_widget_form_alter(&$element, &$form_state, $context) {
// Add a css class to widget form elements for all fields of type mytype.
- if ($context['field']['type'] == 'mytype') {
+ if ($context['field']['type'] === 'mytype') {
// Be sure not to overwrite existing attributes.
$element['#attributes']['class'][] = 'myclass';
}
@@ -1393,7 +1393,7 @@ function hook_field_attach_delete_revision($entity_type, $entity) {
*/
function hook_field_attach_purge($entity_type, $entity, $field, $instance) {
// find the corresponding data in mymodule and purge it
- if ($entity_type == 'node' && $field->field_name == 'my_field_name') {
+ if ($entity_type === 'node' && $field->field_name === 'my_field_name') {
mymodule_remove_mydata($entity->nid);
}
}
@@ -1422,7 +1422,7 @@ function hook_field_attach_view_alter(&$output, $context) {
// Append RDF term mappings on displayed taxonomy links.
foreach (element_children($output) as $field_name) {
$element = &$output[$field_name];
- if ($element['#field_type'] == 'taxonomy_term_reference' && $element['#formatter'] == 'taxonomy_term_reference_link') {
+ if ($element['#field_type'] === 'taxonomy_term_reference' && $element['#formatter'] === 'taxonomy_term_reference_link') {
foreach ($element['#items'] as $delta => $item) {
$term = $item['taxonomy_term'];
if (!empty($term->rdf_mapping['rdftype'])) {
@@ -1451,7 +1451,7 @@ function hook_field_attach_view_alter(&$output, $context) {
* - source_langcode: The source language from which translate.
*/
function hook_field_attach_prepare_translation_alter(&$entity, $context) {
- if ($context['entity_type'] == 'custom_entity_type') {
+ if ($context['entity_type'] === 'custom_entity_type') {
$entity->custom_field = $context['source_entity']->custom_field;
}
}
@@ -1656,7 +1656,7 @@ function hook_field_storage_details($field) {
* @see hook_field_storage_details()
*/
function hook_field_storage_details_alter(&$details, $field) {
- if ($field['field_name'] == 'field_of_interest') {
+ if ($field['field_name'] === 'field_of_interest') {
$columns = array();
foreach ((array) $field['columns'] as $column_name => $attributes) {
$columns[$column_name] = $column_name;
@@ -1701,7 +1701,7 @@ function hook_field_storage_details_alter(&$details, $field) {
*/
function hook_field_storage_load($entity_type, $entities, $age, $fields, $options) {
$field_info = field_info_field_by_ids();
- $load_current = $age == FIELD_LOAD_CURRENT;
+ $load_current = $age === FIELD_LOAD_CURRENT;
foreach ($fields as $field_id => $ids) {
$field = $field_info[$field_id];
@@ -1727,7 +1727,7 @@ function hook_field_storage_load($entity_type, $entities, $age, $fields, $option
$delta_count[$row->entity_id][$row->langcode] = 0;
}
- if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) {
+ if ($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) {
$item = array();
// For each column declared by the field, populate the item
// from the prefixed database column.
@@ -1777,7 +1777,7 @@ function hook_field_storage_write($entity_type, $entity, $op, $fields) {
$field_langcodes = array_intersect($all_langcodes, array_keys((array) $entity->$field_name));
// Delete and insert, rather than update, in case a value was added.
- if ($op == FIELD_STORAGE_UPDATE) {
+ if ($op === FIELD_STORAGE_UPDATE) {
// Delete language codes present in the incoming $entity->$field_name.
// Delete all language codes if $entity->$field_name is empty.
$langcodes = !empty($entity->$field_name) ? $field_langcodes : $all_langcodes;
@@ -1827,7 +1827,7 @@ function hook_field_storage_write($entity_type, $entity, $op, $fields) {
$revision_query->values($record);
}
- if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count == $field['cardinality']) {
+ if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count === $field['cardinality']) {
break;
}
}
@@ -1917,7 +1917,7 @@ function hook_field_storage_delete_revision($entity_type, $entity, $fields) {
*/
function hook_field_storage_query($query) {
$groups = array();
- if ($query->age == FIELD_LOAD_CURRENT) {
+ if ($query->age === FIELD_LOAD_CURRENT) {
$tablename_function = '_field_sql_storage_tablename';
$id_key = 'entity_id';
}
@@ -1975,7 +1975,7 @@ function hook_field_storage_query($query) {
// Is there a need to sort the query by property?
$has_property_order = FALSE;
foreach ($query->order as $order) {
- if ($order['type'] == 'property') {
+ if ($order['type'] === 'property') {
$has_property_order = TRUE;
}
}
@@ -1997,18 +1997,18 @@ function hook_field_storage_query($query) {
// Order the query.
foreach ($query->order as $order) {
- if ($order['type'] == 'entity') {
+ if ($order['type'] === 'entity') {
$key = $order['specifier'];
$select_query->orderBy("$field_base_table.$key", $order['direction']);
}
- elseif ($order['type'] == 'field') {
+ elseif ($order['type'] === 'field') {
$specifier = $order['specifier'];
$field = $specifier['field'];
$table_alias = $table_aliases[$specifier['index']];
$sql_field = "$table_alias." . _field_sql_storage_columnname($field['field_name'], $specifier['column']);
$select_query->orderBy($sql_field, $order['direction']);
}
- elseif ($order['type'] == 'property') {
+ elseif ($order['type'] === 'property') {
$select_query->orderBy("$entity_base_table." . $order['specifier'], $order['direction']);
}
}
@@ -2141,7 +2141,7 @@ function hook_field_storage_pre_load($entity_type, $entities, $age, &$skip_field
* Saved field IDs are set set as keys in $skip_fields.
*/
function hook_field_storage_pre_insert($entity_type, $entity, &$skip_fields) {
- if ($entity_type == 'node' && $entity->status && _forum_node_check_node_type($entity)) {
+ if ($entity_type === 'node' && $entity->status && _forum_node_check_node_type($entity)) {
$query = db_insert('forum_index')->fields(array('nid', 'title', 'tid', 'sticky', 'created', 'comment_count', 'last_comment_timestamp'));
foreach ($entity->taxonomy_forums as $language) {
foreach ($language as $delta) {
@@ -2180,7 +2180,7 @@ function hook_field_storage_pre_insert($entity_type, $entity, &$skip_fields) {
function hook_field_storage_pre_update($entity_type, $entity, &$skip_fields) {
$first_call = &drupal_static(__FUNCTION__, array());
- if ($entity_type == 'node' && $entity->status && _forum_node_check_node_type($entity)) {
+ if ($entity_type === 'node' && $entity->status && _forum_node_check_node_type($entity)) {
// We don't maintain data for old revisions, so clear all previous values
// from the table. Since this hook runs once per field, per entity, make
// sure we only wipe values once.
@@ -2265,11 +2265,11 @@ function hook_field_info_max_weight($entity_type, $bundle, $context) {
*/
function hook_field_display_alter(&$display, $context) {
// Leave field labels out of the search index.
- // Note: The check against $context['entity_type'] == 'node' could be avoided
+ // Note: The check against $context['entity_type'] === 'node' could be avoided
// by using hook_field_display_node_alter() instead of
// hook_field_display_alter(), resulting in less function calls when
// rendering non-node entities.
- if ($context['entity_type'] == 'node' && $context['view_mode'] == 'search_index') {
+ if ($context['entity_type'] === 'node' && $context['view_mode'] === 'search_index') {
$display['label'] = 'hidden';
}
}
@@ -2300,7 +2300,7 @@ function hook_field_display_alter(&$display, $context) {
*/
function hook_field_display_ENTITY_TYPE_alter(&$display, $context) {
// Leave field labels out of the search index.
- if ($context['view_mode'] == 'search_index') {
+ if ($context['view_mode'] === 'search_index') {
$display['label'] = 'hidden';
}
}
@@ -2322,7 +2322,7 @@ function hook_field_display_ENTITY_TYPE_alter(&$display, $context) {
* - view_mode: The view mode, e.g. 'full', 'teaser'...
*/
function hook_field_extra_fields_display_alter(&$displays, $context) {
- if ($context['entity_type'] == 'taxonomy_term' && $context['view_mode'] == 'full') {
+ if ($context['entity_type'] === 'taxonomy_term' && $context['view_mode'] === 'full') {
$displays['description']['visible'] = FALSE;
}
}
@@ -2353,7 +2353,7 @@ function hook_field_extra_fields_display_alter(&$displays, $context) {
function hook_field_widget_properties_alter(&$widget, $context) {
// Change a widget's type according to the time of day.
$field = $context['field'];
- if ($context['entity_type'] == 'node' && $field['field_name'] == 'field_foo') {
+ if ($context['entity_type'] === 'node' && $field['field_name'] === 'field_foo') {
$time = date('H');
$widget['type'] = $time < 12 ? 'widget_am' : 'widget_pm';
}
@@ -2385,7 +2385,7 @@ function hook_field_widget_properties_alter(&$widget, $context) {
function hook_field_widget_properties_ENTITY_TYPE_alter(&$widget, $context) {
// Change a widget's type according to the time of day.
$field = $context['field'];
- if ($field['field_name'] == 'field_foo') {
+ if ($field['field_name'] === 'field_foo') {
$time = date('H');
$widget['type'] = $time < 12 ? 'widget_am' : 'widget_pm';
}
@@ -2669,7 +2669,7 @@ function hook_field_storage_purge($entity_type, $entity, $field, $instance) {
* TRUE if the operation is allowed, and FALSE if the operation is denied.
*/
function hook_field_access($op, $field, $entity_type, $entity, $account) {
- if ($field['field_name'] == 'field_of_interest' && $op == 'edit') {
+ if ($field['field_name'] === 'field_of_interest' && $op === 'edit') {
return user_access('edit field of interest', $account);
}
return TRUE;
diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc
index ff579c7..a86d295 100644
--- a/core/modules/field/field.attach.inc
+++ b/core/modules/field/field.attach.inc
@@ -442,7 +442,7 @@ function _field_invoke_get_instances($entity_type, $bundle, $options) {
// Single-field mode by field id: we need to loop on each instance to
// find the right one.
foreach ($instances as $instance) {
- if ($instance['field_id'] == $options['field_id']) {
+ if ($instance['field_id'] === $options['field_id']) {
$instances = array($instance);
break;
}
@@ -615,7 +615,7 @@ function field_attach_form($entity_type, $entity, &$form, &$form_state, $langcod
*/
function field_attach_load($entity_type, $entities, $age = FIELD_LOAD_CURRENT, $options = array()) {
$field_info = field_info_field_by_ids();
- $load_current = $age == FIELD_LOAD_CURRENT;
+ $load_current = $age === FIELD_LOAD_CURRENT;
// Merge default options.
$default_options = array(
diff --git a/core/modules/field/field.crud.inc b/core/modules/field/field.crud.inc
index f9c96c9..aea8fc6 100644
--- a/core/modules/field/field.crud.inc
+++ b/core/modules/field/field.crud.inc
@@ -753,7 +753,7 @@ function field_delete_instance($instance, $field_cleanup = TRUE) {
module_invoke_all('field_delete_instance', $instance);
// Delete the field itself if we just deleted its last instance.
- if ($field_cleanup && count($field['bundles']) == 0) {
+ if ($field_cleanup && count($field['bundles']) === 0) {
field_delete_field($field['field_name']);
}
}
diff --git a/core/modules/field/field.default.inc b/core/modules/field/field.default.inc
index 1e1675c..d8764fc 100644
--- a/core/modules/field/field.default.inc
+++ b/core/modules/field/field.default.inc
@@ -108,7 +108,7 @@ function field_default_insert($entity_type, $entity, $field, $instance, $langcod
// languages get a default value. Otherwise we could have default values for
// not yet open languages.
if (empty($entity) || !property_exists($entity, $field['field_name']) ||
- (isset($entity->{$field['field_name']}[$langcode]) && count($entity->{$field['field_name']}[$langcode]) == 0)) {
+ (isset($entity->{$field['field_name']}[$langcode]) && count($entity->{$field['field_name']}[$langcode]) === 0)) {
$items = field_get_default_value($entity_type, $entity, $field, $instance, $langcode);
}
}
@@ -259,7 +259,7 @@ function field_default_view($entity_type, $entity, $field, $instance, $langcode,
function field_default_prepare_translation($entity_type, $entity, $field, $instance, $langcode, &$items, $source_entity, $source_langcode) {
$field_name = $field['field_name'];
// If the field is untranslatable keep using LANGUAGE_NOT_SPECIFIED.
- if ($langcode == LANGUAGE_NOT_SPECIFIED) {
+ if ($langcode === LANGUAGE_NOT_SPECIFIED) {
$source_langcode = LANGUAGE_NOT_SPECIFIED;
}
if (isset($source_entity->{$field_name}[$source_langcode])) {
diff --git a/core/modules/field/field.form.inc b/core/modules/field/field.form.inc
index be3685d..dd27e9d 100644
--- a/core/modules/field/field.form.inc
+++ b/core/modules/field/field.form.inc
@@ -52,7 +52,7 @@ function field_default_form($entity_type, $entity, $field, $instance, $langcode,
// If field module handles multiple values for this form element, and we
// are displaying an individual element, process the multiple value form.
- if (!isset($get_delta) && field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) {
+ if (!isset($get_delta) && field_behaviors_widget('multiple values', $instance) === FIELD_BEHAVIOR_DEFAULT) {
$elements = field_multiple_value_form($field, $instance, $langcode, $items, $form, $form_state);
}
// If the widget is handling multiple values (e.g Options), or if we are
@@ -72,7 +72,7 @@ function field_default_form($entity_type, $entity, $field, $instance, $langcode,
'#title' => check_plain($instance['label']),
'#description' => field_filter_xss($instance['description']),
// Only the first widget should be required.
- '#required' => $delta == 0 && $instance['required'],
+ '#required' => $delta === 0 && $instance['required'],
'#delta' => $delta,
);
if ($element = $function($form, $form_state, $field, $instance, $langcode, $items, $delta, $element)) {
@@ -92,7 +92,7 @@ function field_default_form($entity_type, $entity, $field, $instance, $langcode,
// For fields that handle their own processing, we can't make
// assumptions about how the field is structured, just merge in the
// returned element.
- if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) {
+ if (field_behaviors_widget('multiple values', $instance) === FIELD_BEHAVIOR_DEFAULT) {
$elements[$delta] = $element;
}
else {
@@ -173,7 +173,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form,
$function = $instance['widget']['module'] . '_field_widget_form';
if (function_exists($function)) {
for ($delta = 0; $delta <= $max; $delta++) {
- $multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED;
+ $multiple = $field['cardinality'] > 1 || $field['cardinality'] === FIELD_CARDINALITY_UNLIMITED;
$element = array(
'#entity_type' => $instance['entity_type'],
'#bundle' => $instance['bundle'],
@@ -185,7 +185,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form,
'#title' => $multiple ? '' : $title,
'#description' => $multiple ? '' : $description,
// Only the first widget should be required.
- '#required' => $delta == 0 && $instance['required'],
+ '#required' => $delta === 0 && $instance['required'],
'#delta' => $delta,
'#weight' => $delta,
);
@@ -233,7 +233,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form,
'#max_delta' => $max,
);
// Add 'add more' button, if not working with a programmed form.
- if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED && empty($form_state['programmed'])) {
+ if ($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED && empty($form_state['programmed'])) {
$field_elements['add_more'] = array(
'#type' => 'submit',
'#name' => strtr($id_prefix, '-', '_') . '_add_more',
@@ -270,7 +270,7 @@ function theme_field_multiple_value_form($variables) {
$element = $variables['element'];
$output = '';
- if ($element['#cardinality'] > 1 || $element['#cardinality'] == FIELD_CARDINALITY_UNLIMITED) {
+ if ($element['#cardinality'] > 1 || $element['#cardinality'] === FIELD_CARDINALITY_UNLIMITED) {
$table_id = drupal_html_id($element['#field_name'] . '_values');
$order_class = $element['#field_name'] . '-delta-order';
$required = !empty($element['#required']) ? theme('form_required_marker', $variables) : '';
diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc
index 78bc62e..a0e053c 100644
--- a/core/modules/field/field.info.inc
+++ b/core/modules/field/field.info.inc
@@ -305,7 +305,7 @@ function _field_info_prepare_instance($instance, $field) {
$instance['settings'] += field_info_instance_settings($field['type']);
// Set a default value for the instance.
- if (field_behaviors_widget('default value', $instance) == FIELD_BEHAVIOR_DEFAULT && !isset($instance['default_value'])) {
+ if (field_behaviors_widget('default value', $instance) === FIELD_BEHAVIOR_DEFAULT && !isset($instance['default_value'])) {
$instance['default_value'] = NULL;
}
@@ -321,7 +321,7 @@ function _field_info_prepare_instance($instance, $field) {
$view_modes = array_merge(array('default'), array_keys($entity_info['view modes']));
$view_mode_settings = field_view_mode_settings($instance['entity_type'], $instance['bundle']);
foreach ($view_modes as $view_mode) {
- if ($view_mode == 'default' || !empty($view_mode_settings[$view_mode]['custom_settings'])) {
+ if ($view_mode === 'default' || !empty($view_mode_settings[$view_mode]['custom_settings'])) {
if (!isset($instance['display'][$view_mode])) {
$instance['display'][$view_mode] = array(
'type' => 'hidden',
@@ -803,7 +803,7 @@ function field_info_max_weight($entity_type, $bundle, $context) {
// Collect weights for fields.
foreach (field_info_instances($entity_type, $bundle) as $instance) {
- if ($context == 'form') {
+ if ($context === 'form') {
$weights[] = $instance['widget']['weight'];
}
elseif (isset($instance['display'][$context]['weight'])) {
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 2f3041c..7db9ed2 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -349,7 +349,7 @@ function field_cron() {
* required if there are any active fields of that type.
*/
function field_system_info_alter(&$info, $file, $type) {
- if ($type == 'module' && module_hook($file->name, 'field_info')) {
+ if ($type === 'module' && module_hook($file->name, 'field_info')) {
$fields = field_read_fields(array('module' => $file->name), array('include_deleted' => TRUE));
if ($fields) {
$info['required'] = TRUE;
@@ -509,7 +509,7 @@ function _field_filter_items($field, $items) {
* user drag-n-drop reordering.
*/
function _field_sort_items($field, $items) {
- if (($field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED) && isset($items[0]['_weight'])) {
+ if (($field['cardinality'] > 1 || $field['cardinality'] === FIELD_CARDINALITY_UNLIMITED) && isset($items[0]['_weight'])) {
usort($items, '_field_sort_items_helper');
foreach ($items as $delta => $item) {
if (is_array($items[$delta])) {
@@ -720,7 +720,7 @@ function _field_extra_fields_pre_render($elements) {
$entity_type = $elements['#entity_type'];
$bundle = $elements['#bundle'];
- if (isset($elements['#type']) && $elements['#type'] == 'form') {
+ if (isset($elements['#type']) && $elements['#type'] === 'form') {
$extra_fields = field_info_extra_fields($entity_type, $bundle, 'form');
foreach ($extra_fields as $name => $settings) {
if (isset($elements[$name])) {
@@ -1037,7 +1037,7 @@ function template_preprocess_field(&$variables, $hook) {
// supposed to be hidden. If a theme implementation needs to print a hidden
// label, it needs to supply a preprocess function that sets it to the
// sanitized element title or whatever else is wanted in its place.
- $variables['label_hidden'] = ($element['#label_display'] == 'hidden');
+ $variables['label_hidden'] = ($element['#label_display'] === 'hidden');
$variables['label'] = $variables['label_hidden'] ? NULL : check_plain($element['#title']);
// We want other preprocess functions and the theme implementation to have
@@ -1065,7 +1065,7 @@ function template_preprocess_field(&$variables, $hook) {
);
// Add a "clearfix" class to the wrapper since we float the label and the
// field items in field.css if the label is inline.
- if ($element['#label_display'] == 'inline') {
+ if ($element['#label_display'] === 'inline') {
$variables['classes_array'][] = 'clearfix';
}
diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.install b/core/modules/field/modules/field_sql_storage/field_sql_storage.install
index 2229ef4..026c3bf 100644
--- a/core/modules/field/modules/field_sql_storage/field_sql_storage.install
+++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.install
@@ -16,7 +16,7 @@ function field_sql_storage_schema() {
$fields = field_read_fields(array(), array('include_deleted' => TRUE, 'include_inactive' => TRUE));
drupal_load('module', 'field_sql_storage');
foreach ($fields as $field) {
- if ($field['storage']['type'] == 'field_sql_storage') {
+ if ($field['storage']['type'] === 'field_sql_storage') {
$schema += _field_sql_storage_schema($field);
}
}
diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.module b/core/modules/field/modules/field_sql_storage/field_sql_storage.module
index 14e5745..9da9fdf 100644
--- a/core/modules/field/modules/field_sql_storage/field_sql_storage.module
+++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.module
@@ -328,7 +328,7 @@ function field_sql_storage_field_storage_delete_field($field) {
*/
function field_sql_storage_field_storage_load($entity_type, $entities, $age, $fields, $options) {
$field_info = field_info_field_by_ids();
- $load_current = $age == FIELD_LOAD_CURRENT;
+ $load_current = $age === FIELD_LOAD_CURRENT;
foreach ($fields as $field_id => $ids) {
$field = $field_info[$field_id];
@@ -354,7 +354,7 @@ function field_sql_storage_field_storage_load($entity_type, $entities, $age, $fi
$delta_count[$row->entity_id][$row->langcode] = 0;
}
- if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) {
+ if ($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) {
$item = array();
// For each column declared by the field, populate the item
// from the prefixed database column.
@@ -390,7 +390,7 @@ function field_sql_storage_field_storage_write($entity_type, $entity, $op, $fiel
$field_langcodes = array_intersect($all_langcodes, array_keys((array) $entity->$field_name));
// Delete and insert, rather than update, in case a value was added.
- if ($op == FIELD_STORAGE_UPDATE) {
+ if ($op === FIELD_STORAGE_UPDATE) {
// Delete language codes present in the incoming $entity->$field_name.
// Delete all language codes if $entity->$field_name is empty.
$langcodes = !empty($entity->$field_name) ? $field_langcodes : $all_langcodes;
@@ -440,7 +440,7 @@ function field_sql_storage_field_storage_write($entity_type, $entity, $op, $fiel
$revision_query->values($record);
}
- if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count == $field['cardinality']) {
+ if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count === $field['cardinality']) {
break;
}
}
@@ -495,7 +495,7 @@ function field_sql_storage_field_storage_purge($entity_type, $entity, $field, $i
* Implements hook_field_storage_query().
*/
function field_sql_storage_field_storage_query(EntityFieldQuery $query) {
- if ($query->age == FIELD_LOAD_CURRENT) {
+ if ($query->age === FIELD_LOAD_CURRENT) {
$tablename_function = '_field_sql_storage_tablename';
$id_key = 'entity_id';
}
@@ -539,7 +539,7 @@ function field_sql_storage_field_storage_query(EntityFieldQuery $query) {
// Is there a need to sort the query by property?
$has_property_order = FALSE;
foreach ($query->order as $order) {
- if ($order['type'] == 'property') {
+ if ($order['type'] === 'property') {
$has_property_order = TRUE;
}
}
@@ -561,18 +561,18 @@ function field_sql_storage_field_storage_query(EntityFieldQuery $query) {
// Order the query.
foreach ($query->order as $order) {
- if ($order['type'] == 'entity') {
+ if ($order['type'] === 'entity') {
$key = $order['specifier'];
$select_query->orderBy("$field_base_table.$key", $order['direction']);
}
- elseif ($order['type'] == 'field') {
+ elseif ($order['type'] === 'field') {
$specifier = $order['specifier'];
$field = $specifier['field'];
$table_alias = $table_aliases[$specifier['index']];
$sql_field = "$table_alias." . _field_sql_storage_columnname($field['field_name'], $specifier['column']);
$select_query->orderBy($sql_field, $order['direction']);
}
- elseif ($order['type'] == 'property') {
+ elseif ($order['type'] === 'property') {
$select_query->orderBy("$entity_base_table." . $order['specifier'], $order['direction']);
}
}
@@ -691,7 +691,7 @@ function field_sql_storage_field_attach_rename_bundle($entity_type, $bundle_old,
$instances = field_read_instances(array('entity_type' => $entity_type, 'bundle' => $bundle_new), array('include_deleted' => TRUE, 'include_inactive' => TRUE));
foreach ($instances as $instance) {
$field = field_info_field_by_id($instance['field_id']);
- if ($field['storage']['type'] == 'field_sql_storage') {
+ if ($field['storage']['type'] === 'field_sql_storage') {
$table_name = _field_sql_storage_tablename($field);
$revision_name = _field_sql_storage_revision_tablename($field);
db_update($table_name)
diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.test b/core/modules/field/modules/field_sql_storage/field_sql_storage.test
index 87c388a..1cc98fc 100644
--- a/core/modules/field/modules/field_sql_storage/field_sql_storage.test
+++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.test
@@ -165,7 +165,7 @@ class FieldSqlStorageTestCase extends DrupalWebTestCase {
foreach ($results as $row) {
$this->assertEqual($row->{$this->field_name . '_value'}, $rev_values[$row->revision_id][$row->delta]['value'], "Value {$row->delta} for revision {$row->revision_id} stored correctly");
unset($rev_values[$row->revision_id][$row->delta]);
- if (count($rev_values[$row->revision_id]) == 1) {
+ if (count($rev_values[$row->revision_id]) === 1) {
unset($rev_values[$row->revision_id]);
}
}
diff --git a/core/modules/field/modules/list/list.module b/core/modules/field/modules/list/list.module
index c2bff2a..8bffc71 100644
--- a/core/modules/field/modules/list/list.module
+++ b/core/modules/field/modules/list/list.module
@@ -77,7 +77,7 @@ function list_field_settings_form($field, $instance, $has_data) {
);
$description = '
' . t('The possible values this field can contain. Enter one value per line, in the format key|label.');
- if ($field['type'] == 'list_integer' || $field['type'] == 'list_float') {
+ if ($field['type'] === 'list_integer' || $field['type'] === 'list_float') {
$description .= ' ' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.');
$description .= ' ' . t('The label is optional: if a line contains a single number, it will be used as key and label.');
$description .= ' ' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
@@ -132,10 +132,10 @@ function list_field_settings_form($field, $instance, $has_data) {
}
// Alter the description for allowed values depending on the widget type.
- if ($instance['widget']['type'] == 'options_onoff') {
+ if ($instance['widget']['type'] === 'options_onoff') {
$form['allowed_values']['#description'] .= '
' . t("For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the Allowed values section. Note that the checkbox will be labeled with the label of the 'on' value.") . '
' . t("The 'checkboxes/radio buttons' widget will display checkboxes if the Number of values option is greater than 1 for this field, otherwise radios will be displayed.") . '
';
}
$form['allowed_values']['#description'] .= '
' . t('Allowed HTML tags in labels: @tags', array('@tags' => _field_filter_xss_display_allowed_tags())) . '
';
@@ -161,7 +161,7 @@ function list_allowed_values_setting_validate($element, &$form_state) {
$field = $element['#field'];
$has_data = $element['#field_has_data'];
$field_type = $field['type'];
- $generate_keys = ($field_type == 'list_integer' || $field_type == 'list_float') && !$has_data;
+ $generate_keys = ($field_type === 'list_integer' || $field_type === 'list_float') && !$has_data;
$values = list_extract_allowed_values($element['#value'], $field['type'], $generate_keys);
@@ -171,15 +171,15 @@ function list_allowed_values_setting_validate($element, &$form_state) {
else {
// Check that keys are valid for the field type.
foreach ($values as $key => $value) {
- if ($field_type == 'list_integer' && !preg_match('/^-?\d+$/', $key)) {
+ if ($field_type === 'list_integer' && !preg_match('/^-?\d+$/', $key)) {
form_error($element, t('Allowed values list: keys must be integers.'));
break;
}
- if ($field_type == 'list_float' && !is_numeric($key)) {
+ if ($field_type === 'list_float' && !is_numeric($key)) {
form_error($element, t('Allowed values list: each key must be a valid integer or decimal.'));
break;
}
- elseif ($field_type == 'list_text' && drupal_strlen($key) > 255) {
+ elseif ($field_type === 'list_text' && drupal_strlen($key) > 255) {
form_error($element, t('Allowed values list: each key must be a string at most 255 characters long.'));
break;
}
@@ -282,9 +282,9 @@ function list_extract_allowed_values($string, $field_type, $generate_keys) {
}
// Otherwise see if we can use the value as the key. Detecting true integer
// strings takes a little trick.
- elseif ($field_type == 'list_text'
- || ($field_type == 'list_float' && is_numeric($text))
- || ($field_type == 'list_integer' && is_numeric($text) && (float) $text == intval($text))) {
+ elseif ($field_type === 'list_text'
+ || ($field_type === 'list_float' && is_numeric($text))
+ || ($field_type === 'list_integer' && is_numeric($text) && (float) $text === intval($text))) {
$key = $value = $text;
$explicit_keys = TRUE;
}
@@ -300,7 +300,7 @@ function list_extract_allowed_values($string, $field_type, $generate_keys) {
// Float keys are represented as strings and need to be disambiguated
// ('.5' is '0.5').
- if ($field_type == 'list_float' && is_numeric($key)) {
+ if ($field_type === 'list_float' && is_numeric($key)) {
$key = (string) (float) $key;
}
@@ -341,7 +341,7 @@ function list_allowed_values_string($values) {
* Implements hook_field_update_forbid().
*/
function list_field_update_forbid($field, $prior_field, $has_data) {
- if ($field['module'] == 'list' && $has_data) {
+ if ($field['module'] === 'list' && $has_data) {
// Forbid any update that removes allowed values with actual data.
$lost_keys = array_diff(array_keys($prior_field['settings']['allowed_values']), array_keys($field['settings']['allowed_values']));
if (_list_values_in_use($field, $lost_keys)) {
diff --git a/core/modules/field/modules/number/number.module b/core/modules/field/modules/number/number.module
index 1b9a300..88a7495 100644
--- a/core/modules/field/modules/number/number.module
+++ b/core/modules/field/modules/number/number.module
@@ -55,7 +55,7 @@ function number_field_settings_form($field, $instance, $has_data) {
$settings = $field['settings'];
$form = array();
- if ($field['type'] == 'number_decimal') {
+ if ($field['type'] === 'number_decimal') {
$form['precision'] = array(
'#type' => 'select',
'#title' => t('Precision'),
@@ -145,7 +145,7 @@ function number_field_validate($entity_type, $entity, $field, $instance, $langco
* Implements hook_field_presave().
*/
function number_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
- if ($field['type'] == 'number_decimal') {
+ if ($field['type'] === 'number_decimal') {
// Let PHP round the value to ensure consistent behavior across storage
// backends.
foreach ($items as $delta => $item) {
@@ -212,7 +212,7 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
$display = $instance['display'][$view_mode];
$settings = $display['settings'];
- if ($display['type'] == 'number_decimal' || $display['type'] == 'number_integer') {
+ if ($display['type'] === 'number_decimal' || $display['type'] === 'number_integer') {
$options = array(
'' => t(''),
'.' => t('Decimal point'),
@@ -226,7 +226,7 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
'#default_value' => $settings['thousand_separator'],
);
- if ($display['type'] == 'number_decimal') {
+ if ($display['type'] === 'number_decimal') {
$element['decimal_separator'] = array(
'#type' => 'select',
'#title' => t('Decimal marker'),
@@ -260,7 +260,7 @@ function number_field_formatter_settings_summary($field, $instance, $view_mode)
$settings = $display['settings'];
$summary = array();
- if ($display['type'] == 'number_decimal' || $display['type'] == 'number_integer') {
+ if ($display['type'] === 'number_decimal' || $display['type'] === 'number_integer') {
$summary[] = number_format(1234.1234567890, $settings['scale'], $settings['decimal_separator'], $settings['thousand_separator']);
if ($settings['prefix_suffix']) {
$summary[] = t('Display with prefix and suffix.');
@@ -326,9 +326,9 @@ function number_field_widget_form(&$form, &$form_state, $field, $instance, $lang
'#default_value' => $value,
// Allow a slightly larger size that the field length to allow for some
// configurations where all characters won't fit in input field.
- '#size' => $field['type'] == 'number_decimal' ? $field['settings']['precision'] + 4 : 12,
+ '#size' => $field['type'] === 'number_decimal' ? $field['settings']['precision'] + 4 : 12,
// Allow two extra characters for signed values and decimal separator.
- '#maxlength' => $field['type'] == 'number_decimal' ? $field['settings']['precision'] + 2 : 10,
+ '#maxlength' => $field['type'] === 'number_decimal' ? $field['settings']['precision'] + 2 : 10,
);
// Set the step for floating point and decimal numbers.
diff --git a/core/modules/field/modules/options/options.module b/core/modules/field/modules/options/options.module
index 04b88d8..94dfc6b 100644
--- a/core/modules/field/modules/options/options.module
+++ b/core/modules/field/modules/options/options.module
@@ -74,7 +74,7 @@ function options_field_widget_form(&$form, &$form_state, $field, $instance, $lan
$value_key = key($field['columns']);
$type = str_replace('options_', '', $instance['widget']['type']);
- $multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED;
+ $multiple = $field['cardinality'] > 1 || $field['cardinality'] === FIELD_CARDINALITY_UNLIMITED;
$required = $element['#required'];
$has_value = isset($items[0][$value_key]);
$properties = _options_properties($type, $multiple, $required, $has_value);
@@ -98,7 +98,7 @@ function options_field_widget_form(&$form, &$form_state, $field, $instance, $lan
case 'buttons':
// If required and there is one single option, preselect it.
- if ($required && count($options) == 1) {
+ if ($required && count($options) === 1) {
reset($options);
$default_value = array(key($options));
}
@@ -124,7 +124,7 @@ function options_field_widget_form(&$form, &$form_state, $field, $instance, $lan
$on_value = array_shift($keys);
$element += array(
'#type' => 'checkbox',
- '#default_value' => (isset($default_value[0]) && $default_value[0] == $on_value) ? 1 : 0,
+ '#default_value' => (isset($default_value[0]) && $default_value[0] === $on_value) ? 1 : 0,
'#on_value' => $on_value,
'#off_value' => $off_value,
);
@@ -151,7 +151,7 @@ function options_field_widget_form(&$form, &$form_state, $field, $instance, $lan
*/
function options_field_widget_settings_form($field, $instance) {
$form = array();
- if ($instance['widget']['type'] == 'options_onoff') {
+ if ($instance['widget']['type'] === 'options_onoff') {
$form['display_label'] = array(
'#type' => 'checkbox',
'#title' => t('Use field label instead of the "On value" as label'),
@@ -166,7 +166,7 @@ function options_field_widget_settings_form($field, $instance) {
* Form element validation handler for options element.
*/
function options_field_widget_validate($element, &$form_state) {
- if ($element['#required'] && $element['#value'] == '_none') {
+ if ($element['#required'] && $element['#value'] === '_none') {
form_error($element, t('!name field is required.', array('!name' => $element['#title'])));
}
// Transpose selections from field => delta to delta => field, turning
@@ -302,12 +302,12 @@ function _options_form_to_storage($element) {
$properties = $element['#properties'];
// On/off checkbox: transform '0 / 1' into the 'on / off' values.
- if ($element['#type'] == 'checkbox') {
+ if ($element['#type'] === 'checkbox') {
$values = array($values[0] ? $element['#on_value'] : $element['#off_value']);
}
// Filter out the 'none' option. Use a strict comparison, because
- // 0 == 'any string'.
+ // 0 === 'any string'.
if ($properties['empty_option']) {
$index = array_search('_none', $values, TRUE);
if ($index !== FALSE) {
@@ -406,7 +406,7 @@ function theme_options_none($variables) {
break;
case 'options_select':
- $output = ($option == 'option_none' ? t('- None -') : t('- Select a value -'));
+ $output = ($option === 'option_none' ? t('- None -') : t('- Select a value -'));
break;
}
diff --git a/core/modules/field/modules/text/text.js b/core/modules/field/modules/text/text.js
index 8527355..f8d480f 100644
--- a/core/modules/field/modules/text/text.js
+++ b/core/modules/field/modules/text/text.js
@@ -17,7 +17,7 @@ Drupal.behaviors.textSummary = {
// Create a placeholder label when the field cardinality is
// unlimited or greater than 1.
- if ($fullLabel.length == 0) {
+ if ($fullLabel.length === 0) {
$fullLabel = $('').prependTo($full);
}
@@ -36,7 +36,7 @@ Drupal.behaviors.textSummary = {
).appendTo($summaryLabel);
// If no summary is set, hide the summary field.
- if ($(this).find('.text-summary').val() == '') {
+ if ($(this).find('.text-summary').val() === '') {
$link.click();
}
return;
diff --git a/core/modules/field/modules/text/text.module b/core/modules/field/modules/text/text.module
index 985fa9b..90a70f8 100644
--- a/core/modules/field/modules/text/text.module
+++ b/core/modules/field/modules/text/text.module
@@ -64,7 +64,7 @@ function text_field_settings_form($field, $instance, $has_data) {
$form = array();
- if ($field['type'] == 'text') {
+ if ($field['type'] === 'text') {
$form['max_length'] = array(
'#type' => 'number',
'#title' => t('Maximum length'),
@@ -96,7 +96,7 @@ function text_field_instance_settings_form($field, $instance) {
t('Filtered text (user selects text format)'),
),
);
- if ($field['type'] == 'text_with_summary') {
+ if ($field['type'] === 'text_with_summary') {
$form['display_summary'] = array(
'#type' => 'checkbox',
'#title' => t('Summary input'),
@@ -157,7 +157,7 @@ function text_field_load($entity_type, $entities, $field, $instances, $langcode,
// by formatters if needed.
if (empty($instances[$id]['settings']['text_processing']) || filter_format_allowcache($item['format'])) {
$items[$id][$delta]['safe_value'] = isset($item['value']) ? _text_sanitize($instances[$id], $langcode, $item, 'value') : '';
- if ($field['type'] == 'text_with_summary') {
+ if ($field['type'] === 'text_with_summary') {
$items[$id][$delta]['safe_summary'] = isset($item['summary']) ? _text_sanitize($instances[$id], $langcode, $item, 'summary') : '';
}
}
@@ -262,7 +262,7 @@ function text_field_formatter_view($entity_type, $entity, $field, $instance, $la
case 'text_trimmed':
foreach ($items as $delta => $item) {
$output = _text_sanitize($instance, $langcode, $item, 'value');
- if ($display['type'] == 'text_trimmed') {
+ if ($display['type'] === 'text_trimmed') {
$output = text_summary($output, $instance['settings']['text_processing'] ? $item['format'] : NULL, $display['settings']['trim_length']);
}
$element[$delta] = array('#markup' => $output);
@@ -356,7 +356,7 @@ function text_summary($text, $format = NULL, $size = NULL) {
$delimiter = strpos($text, '');
// If the size is zero, and there is no delimiter, the entire body is the summary.
- if ($size == 0 && $delimiter === FALSE) {
+ if ($size === 0 && $delimiter === FALSE) {
return $text;
}
@@ -474,7 +474,7 @@ function text_field_widget_settings_form($field, $instance) {
$widget = $instance['widget'];
$settings = $widget['settings'];
- if ($widget['type'] == 'text_textfield') {
+ if ($widget['type'] === 'text_textfield') {
$form['size'] = array(
'#type' => 'number',
'#title' => t('Size of textfield'),
diff --git a/core/modules/field/tests/field.test b/core/modules/field/tests/field.test
index 8f94063..9ccc38e 100644
--- a/core/modules/field/tests/field.test
+++ b/core/modules/field/tests/field.test
@@ -2745,7 +2745,7 @@ class FieldTranslationsTestCase extends FieldTestCase {
$this->field['translatable'] = FALSE;
field_update_field($this->field);
$available_langcodes = field_available_languages($this->entity_type, $this->field);
- $this->assertTrue(count($available_langcodes) == 1 && $available_langcodes[0] === LANGUAGE_NOT_SPECIFIED, t('For untranslatable fields only LANGUAGE_NOT_SPECIFIED is available.'));
+ $this->assertTrue(count($available_langcodes) === 1 && $available_langcodes[0] === LANGUAGE_NOT_SPECIFIED, t('For untranslatable fields only LANGUAGE_NOT_SPECIFIED is available.'));
}
/**
@@ -2890,7 +2890,7 @@ class FieldTranslationsTestCase extends FieldTestCase {
foreach ($field_translations as $langcode => $items) {
$result = TRUE;
foreach ($items as $delta => $item) {
- $result = $result && $item['value'] == $entity->{$this->field_name}[$langcode][$delta]['value'];
+ $result = $result && $item['value'] === $entity->{$this->field_name}[$langcode][$delta]['value'];
}
$this->assertTrue($result, t('%language translation correctly handled.', array('%language' => $langcode)));
}
@@ -2948,7 +2948,7 @@ class FieldTranslationsTestCase extends FieldTestCase {
$display_langcodes = field_language($entity_type, $entity, NULL, $requested_langcode);
foreach ($instances as $instance) {
$field_name = $instance['field_name'];
- $this->assertTrue($display_langcodes[$field_name] == LANGUAGE_NOT_SPECIFIED, t('The display language for field %field_name is %language.', array('%field_name' => $field_name, '%language' => LANGUAGE_NOT_SPECIFIED)));
+ $this->assertTrue($display_langcodes[$field_name] === LANGUAGE_NOT_SPECIFIED, t('The display language for field %field_name is %language.', array('%field_name' => $field_name, '%language' => LANGUAGE_NOT_SPECIFIED)));
}
// Test multiple-fields display languages for translatable entities.
@@ -3018,7 +3018,7 @@ class FieldTranslationsTestCase extends FieldTestCase {
$field_name = $this->field['field_name'];
$entity = field_test_entity_test_load($eid, $evid);
foreach ($available_langcodes as $langcode => $value) {
- $passed = isset($entity->{$field_name}[$langcode]) && $entity->{$field_name}[$langcode][0]['value'] == $value + 1;
+ $passed = isset($entity->{$field_name}[$langcode]) && $entity->{$field_name}[$langcode][0]['value'] === $value + 1;
$this->assertTrue($passed, t('The @language translation for revision @revision was correctly stored', array('@language' => $langcode, '@revision' => $entity->ftvid)));
}
}
@@ -3089,7 +3089,7 @@ class FieldBulkDeleteTestCase extends FieldTestCase {
foreach ($invocations as $argument) {
$found = FALSE;
foreach ($actual_invocations as $actual_arguments) {
- if ($actual_arguments[1] == $argument) {
+ if ($actual_arguments[1] === $argument) {
$found = TRUE;
break;
}
diff --git a/core/modules/field/tests/field_test.field.inc b/core/modules/field/tests/field_test.field.inc
index cc76a99..8f54856 100644
--- a/core/modules/field/tests/field_test.field.inc
+++ b/core/modules/field/tests/field_test.field.inc
@@ -49,7 +49,7 @@ function field_test_field_info() {
* Implements hook_field_update_forbid().
*/
function field_test_field_update_forbid($field, $prior_field, $has_data) {
- if ($field['type'] == 'test_field' && $field['settings']['unchangeable'] != $prior_field['settings']['unchangeable']) {
+ if ($field['type'] === 'test_field' && $field['settings']['unchangeable'] != $prior_field['settings']['unchangeable']) {
throw new FieldException("field_test 'unchangeable' setting cannot be changed'");
}
}
@@ -110,7 +110,7 @@ function field_test_field_validate($entity_type, $entity, $field, $instance, $la
field_test_memorize(__FUNCTION__, $args);
foreach ($items as $delta => $item) {
- if ($item['value'] == -1) {
+ if ($item['value'] === -1) {
$errors[$field['field_name']][$langcode][$delta][] = array(
'error' => 'field_test_invalid',
'message' => t('%name does not accept the value -1.', array('%name' => $instance['label'])),
@@ -348,7 +348,7 @@ function field_test_field_formatter_prepare_view($entity_type, $entities, $field
foreach ($items as $id => $item) {
// To keep the test non-intrusive, only act on the
// 'field_test_with_prepare_view' formatter.
- if ($displays[$id]['type'] == 'field_test_with_prepare_view') {
+ if ($displays[$id]['type'] === 'field_test_with_prepare_view') {
foreach ($item as $delta => $value) {
// Don't add anything on empty values.
if ($value) {
@@ -404,7 +404,7 @@ function field_test_default_value($entity_type, $entity, $field, $instance) {
* Implements hook_field_access().
*/
function field_test_field_access($op, $field, $entity_type, $entity, $account) {
- if ($field['field_name'] == "field_no_{$op}_access") {
+ if ($field['field_name'] === "field_no_{$op}_access") {
return FALSE;
}
return TRUE;
diff --git a/core/modules/field/tests/field_test.install b/core/modules/field/tests/field_test.install
index 5957561..9368d79 100644
--- a/core/modules/field/tests/field_test.install
+++ b/core/modules/field/tests/field_test.install
@@ -117,7 +117,7 @@ function field_test_schema() {
* Implements hook_field_schema().
*/
function field_test_field_schema($field) {
- if ($field['type'] == 'test_field') {
+ if ($field['type'] === 'test_field') {
return array(
'columns' => array(
'value' => array(
diff --git a/core/modules/field/tests/field_test.module b/core/modules/field/tests/field_test.module
index 90e25c8..be9bb81 100644
--- a/core/modules/field/tests/field_test.module
+++ b/core/modules/field/tests/field_test.module
@@ -232,7 +232,7 @@ function field_test_field_attach_view_alter(&$output, $context) {
*/
function field_test_field_widget_properties_alter(&$widget, $context) {
// Make the alter_test_text field 42 characters for nodes and comments.
- if (in_array($context['entity_type'], array('node', 'comment')) && ($context['field']['field_name'] == 'alter_test_text')) {
+ if (in_array($context['entity_type'], array('node', 'comment')) && ($context['field']['field_name'] === 'alter_test_text')) {
$widget['settings']['size'] = 42;
}
}
@@ -242,7 +242,7 @@ function field_test_field_widget_properties_alter(&$widget, $context) {
*/
function field_test_field_widget_properties_user_alter(&$widget, $context) {
// Always use buttons for the alter_test_options field on user forms.
- if ($context['field']['field_name'] == 'alter_test_options') {
+ if ($context['field']['field_name'] === 'alter_test_options') {
$widget['type'] = 'options_buttons';
}
}
diff --git a/core/modules/field/tests/field_test.storage.inc b/core/modules/field/tests/field_test.storage.inc
index eaa0851..bf5953e 100644
--- a/core/modules/field/tests/field_test.storage.inc
+++ b/core/modules/field/tests/field_test.storage.inc
@@ -49,7 +49,7 @@ function field_test_field_storage_details($field) {
function field_test_field_storage_details_alter(&$details, $field) {
// For testing, storage details are changed only because of the field name.
- if ($field['field_name'] == 'field_test_change_my_details') {
+ if ($field['field_name'] === 'field_test_change_my_details') {
$columns = array();
foreach ((array) $field['columns'] as $column_name => $attributes) {
$columns[$column_name] = $column_name;
@@ -83,7 +83,7 @@ function _field_test_storage_data($data = NULL) {
function field_test_field_storage_load($entity_type, $entities, $age, $fields, $options) {
$data = _field_test_storage_data();
- $load_current = $age == FIELD_LOAD_CURRENT;
+ $load_current = $age === FIELD_LOAD_CURRENT;
foreach ($fields as $field_id => $ids) {
$field = field_info_field_by_id($field_id);
@@ -92,13 +92,13 @@ function field_test_field_storage_load($entity_type, $entities, $age, $fields, $
$sub_table = $load_current ? 'current' : 'revisions';
$delta_count = array();
foreach ($field_data[$sub_table] as $row) {
- if ($row->type == $entity_type && (!$row->deleted || $options['deleted'])) {
+ if ($row->type === $entity_type && (!$row->deleted || $options['deleted'])) {
if (($load_current && in_array($row->entity_id, $ids)) || (!$load_current && in_array($row->revision_id, $ids))) {
if (in_array($row->langcode, field_available_languages($entity_type, $field))) {
if (!isset($delta_count[$row->entity_id][$row->langcode])) {
$delta_count[$row->entity_id][$row->langcode] = 0;
}
- if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) {
+ if ($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field['cardinality']) {
$item = array();
foreach ($field['columns'] as $column => $attributes) {
$item[$column] = $row->{$column};
@@ -130,19 +130,19 @@ function field_test_field_storage_write($entity_type, $entity, $op, $fields) {
$field_langcodes = array_intersect($all_langcodes, array_keys((array) $entity->$field_name));
// Delete and insert, rather than update, in case a value was added.
- if ($op == FIELD_STORAGE_UPDATE) {
+ if ($op === FIELD_STORAGE_UPDATE) {
// Delete languages present in the incoming $entity->$field_name.
// Delete all languages if $entity->$field_name is empty.
$langcodes = !empty($entity->$field_name) ? $field_langcodes : $all_langcodes;
if ($langcodes) {
foreach ($field_data['current'] as $key => $row) {
- if ($row->type == $entity_type && $row->entity_id == $id && in_array($row->langcode, $langcodes)) {
+ if ($row->type === $entity_type && $row->entity_id === $id && in_array($row->langcode, $langcodes)) {
unset($field_data['current'][$key]);
}
}
if (isset($vid)) {
foreach ($field_data['revisions'] as $key => $row) {
- if ($row->type == $entity_type && $row->revision_id == $vid) {
+ if ($row->type === $entity_type && $row->revision_id === $vid) {
unset($field_data['revisions'][$key]);
}
}
@@ -173,7 +173,7 @@ function field_test_field_storage_write($entity_type, $entity, $op, $fields) {
$field_data['revisions'][] = $row;
}
- if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count == $field['cardinality']) {
+ if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count === $field['cardinality']) {
break;
}
}
@@ -210,7 +210,7 @@ function field_test_field_storage_purge($entity_type, $entity, $field, $instance
$field_data = &$data[$field['id']];
foreach (array('current', 'revisions') as $sub_table) {
foreach ($field_data[$sub_table] as $key => $row) {
- if ($row->type == $entity_type && $row->entity_id == $id) {
+ if ($row->type === $entity_type && $row->entity_id === $id) {
unset($field_data[$sub_table][$key]);
}
}
@@ -230,7 +230,7 @@ function field_test_field_storage_delete_revision($entity_type, $entity, $fields
$field_data = &$data[$field_id];
foreach (array('current', 'revisions') as $sub_table) {
foreach ($field_data[$sub_table] as $key => $row) {
- if ($row->type == $entity_type && $row->entity_id == $id && $row->revision_id == $vid) {
+ if ($row->type === $entity_type && $row->entity_id === $id && $row->revision_id === $vid) {
unset($field_data[$sub_table][$key]);
}
}
@@ -246,7 +246,7 @@ function field_test_field_storage_delete_revision($entity_type, $entity, $fields
function field_test_field_storage_query($field_id, $conditions, $count, &$cursor = NULL, $age) {
$data = _field_test_storage_data();
- $load_current = $age == FIELD_LOAD_CURRENT;
+ $load_current = $age === FIELD_LOAD_CURRENT;
$field = field_info_field_by_id($field_id);
$field_columns = array_keys($field['columns']);
@@ -269,7 +269,7 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor
break;
}
- if ($row->field_id == $field['id']) {
+ if ($row->field_id === $field['id']) {
$match = TRUE;
$condition_deleted = FALSE;
// Add conditions.
@@ -280,7 +280,7 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor
}
switch ($operator) {
case '=':
- $match = $match && $row->{$column} == $value;
+ $match = $match && $row->{$column} === $value;
break;
case '<>':
case '<':
@@ -306,7 +306,7 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor
break;
}
// Track condition on 'deleted'.
- if ($column == 'deleted') {
+ if ($column === 'deleted') {
$condition_deleted = TRUE;
}
}
@@ -351,8 +351,8 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor
* Sorts by entity type and entity id.
*/
function _field_test_field_storage_query_sort_helper($a, $b) {
- if ($a->type == $b->type) {
- if ($a->entity_id == $b->entity_id) {
+ if ($a->type === $b->type) {
+ if ($a->entity_id === $b->entity_id) {
return 0;
}
else {
@@ -368,7 +368,7 @@ function _field_test_field_storage_query_sort_helper($a, $b) {
* Implements hook_field_storage_create_field().
*/
function field_test_field_storage_create_field($field) {
- if ($field['storage']['type'] == 'field_test_storage_failure') {
+ if ($field['storage']['type'] === 'field_test_storage_failure') {
throw new Exception('field_test_storage_failure engine always fails to create fields');
}
@@ -408,7 +408,7 @@ function field_test_field_storage_delete_instance($instance) {
$field_data = &$data[$field['id']];
foreach (array('current', 'revisions') as $sub_table) {
foreach ($field_data[$sub_table] as &$row) {
- if ($row->bundle == $instance['bundle']) {
+ if ($row->bundle === $instance['bundle']) {
$row->deleted = TRUE;
}
}
@@ -434,11 +434,11 @@ function field_test_field_attach_rename_bundle($bundle_old, $bundle_new) {
$instances = field_read_instances(array('bundle' => $bundle_new), array('include_deleted' => TRUE, 'include_inactive' => TRUE));
foreach ($instances as $field_name => $instance) {
$field = field_info_field_by_id($instance['field_id']);
- if ($field['storage']['type'] == 'field_test_storage') {
+ if ($field['storage']['type'] === 'field_test_storage') {
$field_data = &$data[$field['id']];
foreach (array('current', 'revisions') as $sub_table) {
foreach ($field_data[$sub_table] as &$row) {
- if ($row->bundle == $bundle_old) {
+ if ($row->bundle === $bundle_old) {
$row->bundle = $bundle_new;
}
}
@@ -457,11 +457,11 @@ function field_test_field_attach_delete_bundle($entity_type, $bundle, $instances
foreach ($instances as $field_name => $instance) {
$field = field_info_field($field_name);
- if ($field['storage']['type'] == 'field_test_storage') {
+ if ($field['storage']['type'] === 'field_test_storage') {
$field_data = &$data[$field['id']];
foreach (array('current', 'revisions') as $sub_table) {
foreach ($field_data[$sub_table] as &$row) {
- if ($row->bundle == $bundle_old) {
+ if ($row->bundle === $bundle_old) {
$row->deleted = TRUE;
}
}
diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index c22fe21..36f7251 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -120,7 +120,7 @@ function field_ui_display_overview_row_region($row) {
switch ($row['#row_type']) {
case 'field':
case 'extra_field':
- return ($row['format']['type']['#value'] == 'hidden' ? 'hidden' : 'visible');
+ return ($row['format']['type']['#value'] === 'hidden' ? 'hidden' : 'visible');
}
}
@@ -267,7 +267,7 @@ function theme_field_ui_table($variables) {
foreach (element_children($element) as $cell_key) {
$child = &$element[$cell_key];
// Do not render a cell for children of #type 'value'.
- if (!(isset($child['#type']) && $child['#type'] == 'value')) {
+ if (!(isset($child['#type']) && $child['#type'] === 'value')) {
$cell = array('data' => drupal_render($child));
if (isset($child['#cell_attributes'])) {
$cell += $child['#cell_attributes'];
@@ -1048,7 +1048,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
'#field_name' => $name,
);
- if ($form_state['formatter_settings_edit'] == $name) {
+ if ($form_state['formatter_settings_edit'] === $name) {
// We are currently editing this field's formatter settings. Display the
// settings form and submit buttons.
$table[$name]['format']['settings_edit_form'] = array();
@@ -1174,7 +1174,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
$form['fields'] = $table;
// Custom display settings.
- if ($view_mode == 'default') {
+ if ($view_mode === 'default') {
$form['modes'] = array(
'#type' => 'fieldset',
'#title' => t('Custom display settings'),
@@ -1365,12 +1365,12 @@ function field_ui_display_overview_form_submit($form, &$form_state) {
foreach ($form['#extra'] as $name) {
$bundle_settings['extra_fields']['display'][$name][$view_mode] = array(
'weight' => $form_values['fields'][$name]['weight'],
- 'visible' => $form_values['fields'][$name]['type'] == 'visible',
+ 'visible' => $form_values['fields'][$name]['type'] === 'visible',
);
}
// Save view modes data.
- if ($view_mode == 'default') {
+ if ($view_mode === 'default') {
$entity_info = entity_get_info($entity_type);
foreach ($form_values['view_modes_custom'] as $view_mode_name => $value) {
// Display a message for each view mode newly configured to use custom
@@ -1535,7 +1535,7 @@ function field_ui_existing_field_options($entity_type, $bundle) {
foreach (field_info_instances() as $existing_entity_type => $bundles) {
foreach ($bundles as $existing_bundle => $instances) {
// No need to look in the current bundle.
- if (!($existing_bundle == $bundle && $existing_entity_type == $entity_type)) {
+ if (!($existing_bundle === $bundle && $existing_entity_type === $entity_type)) {
foreach ($instances as $instance) {
$field = field_info_field($instance['field_name']);
// Don't show
@@ -1912,7 +1912,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
}
// Add handling for default value if not provided by any other module.
- if (field_behaviors_widget('default value', $instance) == FIELD_BEHAVIOR_DEFAULT && empty($instance['default_value_function'])) {
+ if (field_behaviors_widget('default value', $instance) === FIELD_BEHAVIOR_DEFAULT && empty($instance['default_value_function'])) {
$form['instance']['default_value_widget'] = field_ui_default_value_widget($field, $instance, $form, $form_state);
}
@@ -1936,7 +1936,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
// Build the configurable field values.
$description = t('Maximum number of values users can enter for this field.');
- if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) {
+ if (field_behaviors_widget('multiple values', $instance) === FIELD_BEHAVIOR_DEFAULT) {
$description .= ' ' . t("'Unlimited' will provide an 'Add more' button so the users can add as many values as they like.");
}
$form['field']['cardinality'] = array(
diff --git a/core/modules/field_ui/field_ui.api.php b/core/modules/field_ui/field_ui.api.php
index b6c8aee..c8e39fc 100644
--- a/core/modules/field_ui/field_ui.api.php
+++ b/core/modules/field_ui/field_ui.api.php
@@ -74,7 +74,7 @@ function hook_field_instance_settings_form($field, $instance) {
t('Filtered text (user selects text format)'),
),
);
- if ($field['type'] == 'text_with_summary') {
+ if ($field['type'] === 'text_with_summary') {
$form['display_summary'] = array(
'#type' => 'select',
'#title' => t('Display summary'),
@@ -108,7 +108,7 @@ function hook_field_widget_settings_form($field, $instance) {
$widget = $instance['widget'];
$settings = $widget['settings'];
- if ($widget['type'] == 'text_textfield') {
+ if ($widget['type'] === 'text_textfield') {
$form['size'] = array(
'#type' => 'number',
'#title' => t('Size of textfield'),
@@ -154,7 +154,7 @@ function hook_field_formatter_settings_form($field, $instance, $view_mode, $form
$element = array();
- if ($display['type'] == 'text_trimmed' || $display['type'] == 'text_summary_or_trimmed') {
+ if ($display['type'] === 'text_trimmed' || $display['type'] === 'text_summary_or_trimmed') {
$element['trim_length'] = array(
'#title' => t('Length'),
'#type' => 'number',
@@ -192,7 +192,7 @@ function hook_field_formatter_settings_summary($field, $instance, $view_mode) {
$summary = '';
- if ($display['type'] == 'text_trimmed' || $display['type'] == 'text_summary_or_trimmed') {
+ if ($display['type'] === 'text_trimmed' || $display['type'] === 'text_summary_or_trimmed') {
$summary = t('Length: @chars chars', array('@chars' => $settings['trim_length']));
}
diff --git a/core/modules/field_ui/field_ui.js b/core/modules/field_ui/field_ui.js
index 6de5c15..0536032 100644
--- a/core/modules/field_ui/field_ui.js
+++ b/core/modules/field_ui/field_ui.js
@@ -56,7 +56,7 @@ Drupal.fieldUIFieldOverview = {
});
$this.bind('change keyup', function (e, updateText) {
- var updateText = (typeof updateText == 'undefined' ? true : updateText);
+ var updateText = (typeof updateText === 'undefined' ? true : updateText);
var selectedField = this.options[this.selectedIndex].value;
var selectedFieldType = (selectedField in fields ? fields[selectedField].type : null);
var selectedFieldWidget = (selectedField in fields ? fields[selectedField].widget : null);
@@ -83,7 +83,7 @@ Drupal.fieldUIFieldOverview = {
jQuery.fn.fieldUIPopulateOptions = function (options, selected) {
return this.each(function () {
var disabled = false;
- if (options.length == 0) {
+ if (options.length === 0) {
options = [this.initialValue];
disabled = true;
}
@@ -97,7 +97,7 @@ jQuery.fn.fieldUIPopulateOptions = function (options, selected) {
jQuery.each(options, function (value, text) {
// Figure out which value should be selected. The 'selected' param
// takes precedence.
- var is_selected = ((typeof selected != 'undefined' && value == selected) || (typeof selected == 'undefined' && text == previousSelectedText));
+ var is_selected = ((typeof selected != 'undefined' && value === selected) || (typeof selected === 'undefined' && text === previousSelectedText));
html += '';
});
@@ -204,14 +204,14 @@ Drupal.fieldUIOverview = {
var $this = $(this);
// If the dragged row is in this region, but above the message row, swap
// it down one space.
- if ($this.prev('tr').get(0) == rowObject.group[rowObject.group.length - 1]) {
+ if ($this.prev('tr').get(0) === rowObject.group[rowObject.group.length - 1]) {
// Prevent a recursion problem when using the keyboard to move rows up.
- if ((rowObject.method != 'keyboard' || rowObject.direction == 'down')) {
+ if ((rowObject.method != 'keyboard' || rowObject.direction === 'down')) {
rowObject.swap('after', this);
}
}
// This region has become empty.
- if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length == 0) {
+ if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length === 0) {
$this.removeClass('region-populated').addClass('region-empty');
}
// This region has become populated.
@@ -298,7 +298,7 @@ Drupal.fieldUIDisplayOverview.field.prototype = {
* Returns the region corresponding to the current form values of the row.
*/
getRegion: function () {
- return (this.$formatSelect.val() == 'hidden') ? 'hidden' : 'visible';
+ return (this.$formatSelect.val() === 'hidden') ? 'hidden' : 'visible';
},
/**
@@ -325,7 +325,7 @@ Drupal.fieldUIDisplayOverview.field.prototype = {
var currentValue = this.$formatSelect.val();
switch (region) {
case 'visible':
- if (currentValue == 'hidden') {
+ if (currentValue === 'hidden') {
// Restore the formatter back to the default formatter. Pseudo-fields do
// not have default formatters, we just return to 'visible' for those.
var value = (this.defaultFormatter != undefined) ? this.defaultFormatter : 'visible';
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index c75005a..b233218 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -179,8 +179,8 @@ function field_ui_menu() {
// rules for the bundle admin pages.
'access callback' => '_field_ui_view_mode_menu_access',
'access arguments' => array_merge(array($entity_type, $bundle_arg, $view_mode, $access['access callback']), $access['access arguments']),
- 'type' => ($view_mode == 'default' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK),
- 'weight' => ($view_mode == 'default' ? -10 : $weight++),
+ 'type' => ($view_mode === 'default' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK),
+ 'weight' => ($view_mode === 'default' ? -10 : $weight++),
'file' => 'field_ui.admin.inc',
);
}
@@ -255,7 +255,7 @@ function _field_ui_view_mode_menu_access($entity_type, $bundle, $view_mode, $acc
// setting for the view mode.
$bundle = field_extract_bundle($entity_type, $bundle);
$view_mode_settings = field_view_mode_settings($entity_type, $bundle);
- $visibility = ($view_mode == 'default') || !empty($view_mode_settings[$view_mode]['custom_settings']);
+ $visibility = ($view_mode === 'default') || !empty($view_mode_settings[$view_mode]['custom_settings']);
// Then, determine access according to the $access parameter. This duplicates
// part of _menu_check_access().
@@ -269,8 +269,8 @@ function _field_ui_view_mode_menu_access($entity_type, $bundle, $view_mode, $acc
else {
// As call_user_func_array() is quite slow and user_access is a very
// common callback, it is worth making a special case for it.
- if ($access_callback == 'user_access') {
- return (count($args) == 1) ? user_access($args[0]) : user_access($args[0], $args[1]);
+ if ($access_callback === 'user_access') {
+ return (count($args) === 1) ? user_access($args[0]) : user_access($args[0], $args[1]);
}
else {
return call_user_func_array($access_callback, $args);
diff --git a/core/modules/field_ui/field_ui.test b/core/modules/field_ui/field_ui.test
index 9b71064..718e44b 100644
--- a/core/modules/field_ui/field_ui.test
+++ b/core/modules/field_ui/field_ui.test
@@ -301,12 +301,12 @@ class FieldUIManageFieldsTestCase extends FieldUITestCase {
_field_info_collate_fields_reset();
// Assert field settings.
$field = field_info_field($field_name);
- $this->assertTrue($field['settings']['test_field_setting'] == $string, t('Field settings were found.'));
+ $this->assertTrue($field['settings']['test_field_setting'] === $string, t('Field settings were found.'));
// Assert instance and widget settings.
$instance = field_info_instance($entity_type, $field_name, $bundle);
- $this->assertTrue($instance['settings']['test_instance_setting'] == $string, t('Field instance settings were found.'));
- $this->assertTrue($instance['widget']['settings']['test_widget_setting'] == $string, t('Field widget settings were found.'));
+ $this->assertTrue($instance['settings']['test_instance_setting'] === $string, t('Field instance settings were found.'));
+ $this->assertTrue($instance['widget']['settings']['test_widget_setting'] === $string, t('Field widget settings were found.'));
}
/**
diff --git a/core/modules/file/file.api.php b/core/modules/file/file.api.php
index 7f20d83..8df8c14 100644
--- a/core/modules/file/file.api.php
+++ b/core/modules/file/file.api.php
@@ -27,7 +27,7 @@
* @see hook_field_access().
*/
function hook_file_download_access($field, $entity_type, $entity) {
- if ($entity_type == 'node') {
+ if ($entity_type === 'node') {
return node_access('view', $entity);
}
}
diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc
index a1a2ef9..73630a0 100644
--- a/core/modules/file/file.field.inc
+++ b/core/modules/file/file.field.inc
@@ -351,7 +351,7 @@ function file_field_delete_file($item, $field, $entity_type, $id, $count = 1) {
// are not yet associated with any content at all.
$file = (object) $item;
$file_usage = file_usage_list($file);
- if ($file->status == 0 || !empty($file_usage['file'])) {
+ if ($file->status === 0 || !empty($file_usage['file'])) {
file_usage_delete($file, 'file', $entity_type, $id, $count);
return file_delete($file);
}
@@ -480,7 +480,7 @@ function file_field_widget_form(&$form, &$form_state, $field, $instance, $langco
'#extended' => TRUE,
);
- if ($field['cardinality'] == 1) {
+ if ($field['cardinality'] === 1) {
// Set the default value.
$element['#default_value'] = !empty($items) ? $items[0] : $defaults;
// If there's only one field, return it as delta 0.
@@ -499,11 +499,11 @@ function file_field_widget_form(&$form, &$form_state, $field, $instance, $langco
}
// And then add one more empty row for new uploads except when this is a
// programmed form as it is not necessary.
- if (($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta < $field['cardinality']) && empty($form_state['programmed'])) {
+ if (($field['cardinality'] === FIELD_CARDINALITY_UNLIMITED || $delta < $field['cardinality']) && empty($form_state['programmed'])) {
$elements[$delta] = $element;
$elements[$delta]['#default_value'] = $defaults;
$elements[$delta]['#weight'] = $delta;
- $elements[$delta]['#required'] = ($element['#required'] && $delta == 0);
+ $elements[$delta]['#required'] = ($element['#required'] && $delta === 0);
}
// The group of elements all-together need some extra functionality
// after building up the full list (like draggable table rows).
@@ -856,7 +856,7 @@ function theme_file_widget_multiple($variables) {
$rows = array();
foreach ($widgets as $key => &$widget) {
// Save the uploading row for last.
- if ($widget['#file'] == FALSE) {
+ if ($widget['#file'] === FALSE) {
$widget['#title'] = $element['#file_upload_title'];
$widget['#description'] = $element['#file_upload_description'];
continue;
@@ -866,7 +866,7 @@ function theme_file_widget_multiple($variables) {
// "operations" column.
$operations_elements = array();
foreach (element_children($widget) as $sub_key) {
- if (isset($widget[$sub_key]['#type']) && $widget[$sub_key]['#type'] == 'submit') {
+ if (isset($widget[$sub_key]['#type']) && $widget[$sub_key]['#type'] === 'submit') {
hide($widget[$sub_key]);
$operations_elements[] = &$widget[$sub_key];
}
@@ -953,7 +953,7 @@ function theme_file_upload_help($variables) {
if (isset($upload_validators['file_validate_image_resolution'])) {
$max = $upload_validators['file_validate_image_resolution'][0];
$min = $upload_validators['file_validate_image_resolution'][1];
- if ($min && $max && $min == $max) {
+ if ($min && $max && $min === $max) {
$descriptions[] = t('Images must be exactly !size pixels.', array('!size' => '' . $max . ''));
}
elseif ($min && $max) {
diff --git a/core/modules/file/file.install b/core/modules/file/file.install
index dff930b..8d6bf56 100644
--- a/core/modules/file/file.install
+++ b/core/modules/file/file.install
@@ -52,7 +52,7 @@ function file_requirements($phase) {
$requirements = array();
// Check the server's ability to indicate upload progress.
- if ($phase == 'runtime') {
+ if ($phase === 'runtime') {
$implementation = file_progress_implementation();
$apache = strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== FALSE;
$fastcgi = strpos($_SERVER['SERVER_SOFTWARE'], 'mod_fastcgi') !== FALSE || strpos($_SERVER["SERVER_SOFTWARE"], 'mod_fcgi') !== FALSE;
@@ -77,12 +77,12 @@ function file_requirements($phase) {
$description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.');
$severity = REQUIREMENT_INFO;
}
- elseif ($implementation == 'apc') {
+ elseif ($implementation === 'apc') {
$value = t('Enabled (APC RFC1867)');
$description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the PECL uploadprogress library if possible.');
$severity = REQUIREMENT_OK;
}
- elseif ($implementation == 'uploadprogress') {
+ elseif ($implementation === 'uploadprogress') {
$value = t('Enabled (PECL uploadprogress)');
$severity = REQUIREMENT_OK;
}
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index a2a5a80..bae95fb 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -147,7 +147,7 @@ function file_file_download($uri, $field_type = 'file') {
// temporary files where the host entity has not yet been saved (for example,
// an image preview on a node/add form) in which case, allow download by the
// file's owner.
- if (empty($references) && ($file->status == FILE_STATUS_PERMANENT || $file->uid != $user->uid)) {
+ if (empty($references) && ($file->status === FILE_STATUS_PERMANENT || $file->uid != $user->uid)) {
return;
}
@@ -172,7 +172,7 @@ function file_file_download($uri, $field_type = 'file') {
// Find the field item with the matching URI.
foreach ($field_items as $field_item) {
- if ($field_item['uri'] == $uri) {
+ if ($field_item['uri'] === $uri) {
$field = field_info_field($field_name);
break;
}
@@ -301,14 +301,14 @@ function file_ajax_progress($key) {
);
$implementation = file_progress_implementation();
- if ($implementation == 'uploadprogress') {
+ if ($implementation === 'uploadprogress') {
$status = uploadprogress_get_info($key);
if (isset($status['bytes_uploaded']) && !empty($status['bytes_total'])) {
$progress['message'] = t('Uploading... (@current of @total)', array('@current' => format_size($status['bytes_uploaded']), '@total' => format_size($status['bytes_total'])));
$progress['percentage'] = round(100 * $status['bytes_uploaded'] / $status['bytes_total']);
}
}
- elseif ($implementation == 'apc') {
+ elseif ($implementation === 'apc') {
$status = apc_fetch('upload_' . $key);
if (isset($status['current']) && !empty($status['total'])) {
$progress['message'] = t('Uploading... (@current of @total)', array('@current' => format_size($status['current']), '@total' => format_size($status['total'])));
@@ -390,7 +390,7 @@ function file_managed_file_process($element, &$form_state, $form) {
// Force the progress indicator for the remove button to be either 'none' or
// 'throbber', even if the upload button is using something else.
- $ajax_settings['progress']['type'] = ($element['#progress_indicator'] == 'none') ? 'none' : 'throbber';
+ $ajax_settings['progress']['type'] = ($element['#progress_indicator'] === 'none') ? 'none' : 'throbber';
$ajax_settings['progress']['message'] = NULL;
$ajax_settings['effect'] = 'none';
$element['remove_button'] = array(
@@ -410,10 +410,10 @@ function file_managed_file_process($element, &$form_state, $form) {
);
// Add progress bar support to the upload if possible.
- if ($element['#progress_indicator'] == 'bar' && $implementation = file_progress_implementation()) {
+ if ($element['#progress_indicator'] === 'bar' && $implementation = file_progress_implementation()) {
$upload_progress_key = mt_rand();
- if ($implementation == 'uploadprogress') {
+ if ($implementation === 'uploadprogress') {
$element['UPLOAD_IDENTIFIER'] = array(
'#type' => 'hidden',
'#value' => $upload_progress_key,
@@ -423,7 +423,7 @@ function file_managed_file_process($element, &$form_state, $form) {
'#weight' => -20,
);
}
- elseif ($implementation == 'apc') {
+ elseif ($implementation === 'apc') {
$element['APC_UPLOAD_PROGRESS'] = array(
'#type' => 'hidden',
'#value' => $upload_progress_key,
@@ -556,7 +556,7 @@ function file_managed_file_validate(&$element, &$form_state) {
$clicked_button = end($form_state['triggering_element']['#parents']);
if ($clicked_button != 'remove_button' && !empty($element['fid']['#value'])) {
if ($file = file_load($element['fid']['#value'])) {
- if ($file->status == FILE_STATUS_PERMANENT) {
+ if ($file->status === FILE_STATUS_PERMANENT) {
$references = file_usage_list($file);
if (empty($references)) {
form_error($element, t('The file used in the !name field may not be referenced.', array('!name' => $element['#title'])));
@@ -595,10 +595,10 @@ function file_managed_file_submit($form, &$form_state) {
// the form are processed by file_managed_file_value() regardless of which
// button was clicked. Action is needed here for the remove button, because we
// only remove a file in response to its remove button being clicked.
- if ($button_key == 'remove_button') {
+ if ($button_key === 'remove_button') {
// If it's a temporary file we can safely remove it immediately, otherwise
// it's up to the implementing module to clean up files that are in use.
- if ($element['#file'] && $element['#file']->status == 0) {
+ if ($element['#file'] && $element['#file']->status === 0) {
file_delete($element['#file']);
}
// Update both $form_state['values'] and $form_state['input'] to reflect
@@ -1003,7 +1003,7 @@ function file_get_file_references($file, $field = NULL, $age = FIELD_LOAD_REVISI
$fields = isset($field) ? array($field['field_name'] => $field) : field_info_fields();
foreach ($fields as $field_name => $file_field) {
- if ((empty($field_type) || $file_field['type'] == $field_type) && !isset($references[$field_name])) {
+ if ((empty($field_type) || $file_field['type'] === $field_type) && !isset($references[$field_name])) {
// Get each time this file is used within a field.
$query = new EntityFieldQuery();
$query
diff --git a/core/modules/file/tests/file.test b/core/modules/file/tests/file.test
index 05083fc..ea940c8 100644
--- a/core/modules/file/tests/file.test
+++ b/core/modules/file/tests/file.test
@@ -218,7 +218,7 @@ class FileFieldTestCase extends DrupalWebTestCase {
*/
function assertFileIsPermanent($file, $message = NULL) {
$message = isset($message) ? $message : t('File %file is permanent.', array('%file' => $file->uri));
- $this->assertTrue($file->status == FILE_STATUS_PERMANENT, $message);
+ $this->assertTrue($file->status === FILE_STATUS_PERMANENT, $message);
}
}
@@ -446,7 +446,7 @@ class FileFieldWidgetTestCase extends FileFieldTestCase {
foreach ($buttons as $i => $button) {
$key = $i >= $remaining ? $i - $remaining : $i;
$check_field_name = $field_name2;
- if ($current_field_name == $field_name && $i < $remaining) {
+ if ($current_field_name === $field_name && $i < $remaining) {
$check_field_name = $field_name;
}
@@ -484,12 +484,12 @@ class FileFieldWidgetTestCase extends FileFieldTestCase {
// correct name.
$upload_button_name = $current_field_name . '_' . LANGUAGE_NOT_SPECIFIED . '_' . $remaining . '_upload_button';
$buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', array(':name' => $upload_button_name));
- $this->assertTrue(is_array($buttons) && count($buttons) == 1, t('The upload button is displayed with the correct name (JSMode=%type).', array('%type' => $type)));
+ $this->assertTrue(is_array($buttons) && count($buttons) === 1, t('The upload button is displayed with the correct name (JSMode=%type).', array('%type' => $type)));
// Ensure only at most one button per field is displayed.
$buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
- $expected = $current_field_name == $field_name ? 1 : 2;
- $this->assertTrue(is_array($buttons) && count($buttons) == $expected, t('After removing a file, only one "Upload" button for each possible field is displayed (JSMode=%type).', array('%type' => $type)));
+ $expected = $current_field_name === $field_name ? 1 : 2;
+ $this->assertTrue(is_array($buttons) && count($buttons) === $expected, t('After removing a file, only one "Upload" button for each possible field is displayed (JSMode=%type).', array('%type' => $type)));
}
}
diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc
index 40a5eab..ed0fbbb 100644
--- a/core/modules/filter/filter.admin.inc
+++ b/core/modules/filter/filter.admin.inc
@@ -20,7 +20,7 @@ function filter_admin_overview($form) {
foreach ($formats as $id => $format) {
// Check whether this is the fallback text format. This format is available
// to all roles and cannot be disabled via the admin interface.
- $form['formats'][$id]['#is_fallback'] = ($id == $fallback_format);
+ $form['formats'][$id]['#is_fallback'] = ($id === $fallback_format);
if ($form['formats'][$id]['#is_fallback']) {
$form['formats'][$id]['name'] = array('#markup' => drupal_placeholder($format->name));
$roles_markup = drupal_placeholder(t('All roles may use this format'));
@@ -116,7 +116,7 @@ function filter_admin_format_page($format = NULL) {
* @see filter_admin_format_form_submit()
*/
function filter_admin_format_form($form, &$form_state, $format) {
- $is_fallback = ($format->format == filter_fallback_format());
+ $is_fallback = ($format->format === filter_fallback_format());
$form['#format'] = $format;
$form['#tree'] = TRUE;
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 5fe4caa..071370e 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -250,7 +250,7 @@ function filter_format_save($format) {
->execute();
}
- if ($return == SAVED_NEW) {
+ if ($return === SAVED_NEW) {
module_invoke_all('filter_format_insert', $format);
}
else {
@@ -448,7 +448,7 @@ function filter_formats_reset() {
*/
function filter_get_roles_by_format($format) {
// Handle the fallback format upfront (all roles have access to this format).
- if ($format->format == filter_fallback_format()) {
+ if ($format->format === filter_fallback_format()) {
return user_roles();
}
// Do not list any roles if the permission does not exist.
@@ -988,7 +988,7 @@ function filter_access($format, $account = NULL) {
}
// Handle special cases up front. All users have access to the fallback
// format.
- if ($format->format == filter_fallback_format()) {
+ if ($format->format === filter_fallback_format()) {
return TRUE;
}
// Check the permission if one exists; otherwise, we have a non-existent
@@ -1105,7 +1105,7 @@ function filter_dom_serialize($dom_document) {
*/
function filter_dom_serialize_escape_cdata_element($dom_document, $dom_element, $comment_start = '//', $comment_end = '') {
foreach ($dom_element->childNodes as $node) {
- if (get_class($node) == 'DOMCdataSection') {
+ if (get_class($node) === 'DOMCdataSection') {
// See drupal_get_js(). This code is more or less duplicated there.
$embed_prefix = "\n{$comment_end}\n";
@@ -1449,9 +1449,9 @@ function _filter_url($text, $filter) {
$open_tag = '';
for ($i = 0; $i < count($chunks); $i++) {
- if ($chunk_type == 'text') {
+ if ($chunk_type === 'text') {
// Only process this text if there are no unclosed $ignore_tags.
- if ($open_tag == '') {
+ if ($open_tag === '') {
// If there is a match, inject a link into this chunk via the callback
// function contained in $task.
$chunks[$i] = preg_replace_callback($pattern, $task, $chunks[$i]);
@@ -1461,7 +1461,7 @@ function _filter_url($text, $filter) {
}
else {
// Only process this tag if there are no unclosed $ignore_tags.
- if ($open_tag == '') {
+ if ($open_tag === '') {
// Check whether this tag is contained in $ignore_tags.
if (preg_match("`<($ignore_tags)(?:\s|>)`i", $chunks[$i], $matches)) {
$open_tag = $matches[1];
@@ -1615,7 +1615,7 @@ function _filter_autop($text) {
$output = '';
foreach ($chunks as $i => $chunk) {
if ($i % 2) {
- $comment = (substr($chunk, 0, 4) == '