Commit 751a2aa0 authored by Dmitrii Zadorozhnyi's avatar Dmitrii Zadorozhnyi Committed by Damien McKenna
Browse files

Issue #3274588 by Dmitrii_Zadorozhnyi, DamienMcKenna, loon: PHP warnings... 

Issue #3274588 by Dmitrii_Zadorozhnyi, DamienMcKenna, loon: PHP warnings during static code analysis using Phan.
parent dbe2b9bc

CHANGELOG.txt

+2 −0
Changes for CHANGELOG.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ Metatag 7.x-1.xx, 2022-xx-xx 
#3309125 by DamienMcKenna, ravi.joshi53, Borodada: Argument 1 passed to

  metatag_config_save() must be an instance of object, instance of stdClass

  given, called in metatag/metatag.admin.inc.

#3274588 by Dmitrii_Zadorozhnyi, DamienMcKenna, loon: PHP warnings during static

  code analysis using Phan.





Metatag 7.x-1.30, 2022-07-27

metatag.admin.inc

+5 −0
Changes for metatag.admin.inc: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -416,12 +416,17 @@ function metatag_config_delete_form($form, &$form_state, $config) { 
 */

function metatag_config_delete_form_submit($form, &$form_state) {

  $config = metatag_config_load($form_state['values']['instance']);

  if (is_object($config)) {

    metatag_config_delete($config);



    $label = metatag_config_instance_label($config->instance);

    $delete = metatag_config_access('delete', $config);

    $title = $delete ? t('The meta tag defaults for @label have been deleted.', array('@label' => $label)) : t('The meta tag defaults for @label have been reverted.', array('@label' => $label));

    drupal_set_message($title);

  }

  else {

    drupal_set_message(t('Configuration record could not be found.'), 'warning');

  }



  $form_state['redirect'] = 'admin/config/search/metatags';

}

metatag.module

+13 −5
Changes for metatag.module: 13 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ function metatag_config_save(\stdClass $config) { 
/**

 * Delete a metatag configuration record.

 */

function metatag_config_delete($config) {

function metatag_config_delete(\stdClass $config) {

  db_delete('metatag_config')

    ->condition('instance', $config->instance)

    ->execute();
@@ -1745,6 +1745,7 @@ function metatag_commerce_product_form_submit($form, &$form_state) { 
  // The entity being saved.

  $entity_type = 'commerce_product';

  $product = $form_state[$entity_type];

  if (is_object($product)) {

    $entity_id = $product->product_id;

    $revision_id = $product->revision_id;
@@ -1754,6 +1755,10 @@ function metatag_commerce_product_form_submit($form, &$form_state) { 
    // Update the meta tags for this entity type.

    metatag_metatags_save($entity_type, $entity_id, $revision_id, $form_state['values']['metatags'], $bundle);

  }

  else {

    drupal_set_message(t('Product record could not be found.'), 'warning');

  }

}



/**

 * Implements hook_field_extra_fields().
@@ -2172,7 +2177,10 @@ function metatag_field_attach_form($entity_type, $entity, &$form, &$form_state, 
function metatag_form_alter(&$form, $form_state, $form_id) {

  if (!empty($form['#metatags']) && !isset($form['metatags'])) {

    extract($form['#metatags']);

    $metatags = isset($metatags) ? $metatags : array();

    $options = isset($options) ? $options : array();

    metatag_metatags_form($form, $instance, $metatags, $options);



    unset($form['#metatags']);

  }

}
@@ -2522,7 +2530,7 @@ function metatag_config_instance_label($instance) { 
/**

 * Title callback for meta tag configuration instances.

 */

function metatag_config_title($config) {

function metatag_config_title(\stdClass $config) {

  return metatag_config_instance_label($config->instance);

}
@@ -3280,7 +3288,7 @@ function metatag_translations_delete(array $metatags, $context) { 
/**

 * Implements hook_config_insert().

 */

function i18n_string_metatag_config_insert($config) {

function i18n_string_metatag_config_insert(\stdClass $config) {

  // Implements hook_metatag_config_insert() on behalf of i18n_string.

  $context = 'metatag_config:' . $config->instance;

  metatag_translations_update($config->config, $context);
@@ -3289,7 +3297,7 @@ function i18n_string_metatag_config_insert($config) { 
/**

 * Implements hook_config_update().

 */

function i18n_string_metatag_config_update($config) {

function i18n_string_metatag_config_update(\stdClass $config) {

  // Implements hook_metatag_config_update() on behalf of i18n_string.

  // Defer to the 'insert' function.

  i18n_string_metatag_config_insert($config);
@@ -3298,7 +3306,7 @@ function i18n_string_metatag_config_update($config) { 
/**

 * Implements hook_config_delete().

 */

function i18n_string_metatag_config_delete($config) {

function i18n_string_metatag_config_delete(\stdClass $config) {

  // Implements hook_metatag_config_delete() on behalf of i18n_string.

  $context = 'metatag_config:' . $config->instance;

  metatag_translations_delete($config->config, $context);

metatag_importer/metatag_importer.page_title.inc

+3 −3
Changes for metatag_importer/metatag_importer.page_title.inc: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ function metatag_importer_for_page_title() { 
          $title_setting = $metatag_config_node->config['title']['value'];

        }

        else {

          $title_setting = $metatag_config_global->config['title']['value'];

          $title_setting = isset($metatag_config_global->config['title']['value']) ? $metatag_config_global->config['title']['value'] : '';

        }

        $metatag_title = str_replace('[current-page:title]', trim($pt_data->page_title), $title_setting);

        $metatag_title = str_replace('[node:title]', trim($pt_data->page_title), $metatag_title);
@@ -99,7 +99,7 @@ function metatag_importer_for_page_title() { 
          $title_setting = $metatag_config_taxonomy_term->config['title']['value'];

        }

        else {

          $title_setting = $metatag_config_global->config['title']['value'];

          $title_setting = isset($metatag_config_global->config['title']['value']) ? $metatag_config_global->config['title']['value'] : '';

        }

        $metatag_title = str_replace('[current-page:title]', trim($pt_data->page_title), $title_setting);

        $metatag_title = str_replace('[term:name]', trim($pt_data->page_title), $metatag_title);
@@ -110,7 +110,7 @@ function metatag_importer_for_page_title() { 
          $title_setting = $metatag_config_user->config['title']['value'];

        }

        else {

          $title_setting = $metatag_config_global->config['title']['value'];

          $title_setting = isset($metatag_config_global->config['title']['value']) ? $metatag_config_global->config['title']['value'] : '';

        }

        $metatag_title = str_replace('[current-page:title]', trim($pt_data->page_title), $title_setting);

        $metatag_title = str_replace('[user:name]', trim($pt_data->page_title), $metatag_title);