Commit 7216e657 authored by Neil Drumm's avatar Neil Drumm 👋
Browse files

Issue #3099925 by drumm, crawleyhost, Chi, shelane, apaderno: Correct last merge

parent 52d45a81
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -4595,7 +4595,13 @@ function drupalorg_preprocess_node(&$v) {
 */
function drupalorg_process_node(&$v) {
  if (project_node_is_project($v['node'])) {
    $v['submitted'] = 'Created by ' .$v['name'] . t('!changed', ['!changed' => ' on <time pubdate datetime="' .$v['created']. '">' . format_date($v['created'], 'custom', 'j F Y') . '</time><br> Last updated on <time pubdate datetime="' . $v['node']->changed . '">' . format_date($v['node']->changed, 'custom', 'j F Y') . '</time>']);
    $revisions = node_revision_list($v['node']);
    $oldest_revision = $revisions[min(array_keys($revisions))];
    $v['submitted'] = t('Created by !original-author on !created, updated !changed', [
      '!original-author' => l(format_username($oldest_revision), 'user/' . $oldest_revision->uid),
      '!created' => '<time pubdate datetime="' . $v['node']->created . '">' . format_date($v['node']->created, 'custom', 'j F Y') . '</time>',
      '!changed' => '<time pubdate datetime="' . $v['node']->changed . '">' . format_date($v['node']->changed, 'custom', 'j F Y') . '</time>',
    ]);
  }
}

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ function drupalorg_user_field_group_info() {
      6 => 'drupalorg_documentation_guides',
      7 => 'drupalorg_user_issue_credit',
      8 => 'drupalorg_user_contributor_roles',
      9 => 'drupalorg_user_vetted',
    ),
    'format_type' => 'div',
    'format_settings' => array(
+7 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ function drupalorg_user_strongarm() {
        ),
        'drupalorg_documentation_guides' => array(
          'default' => array(
            'weight' => '8',
            'weight' => '7',
            'visible' => TRUE,
          ),
        ),
@@ -109,6 +109,12 @@ function drupalorg_user_strongarm() {
            'visible' => TRUE,
          ),
        ),
        'drupalorg_user_vetted' => array(
          'default' => array(
            'weight' => '8',
            'visible' => TRUE,
          ),
        ),
      ),
    ),
  );