2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
$row[]=array('data'=>t('%date by %username',array('%date'=>l(format_date($revision->timestamp,'small'),"node/$node->nid"),'%username'=>theme('username',$revision)))
$row[]=t('%date by %username',array('%date'=>l(format_date($revision->timestamp,'small'),"node/$node->nid/revisions/$revision->vid/view"),'%username'=>theme('username',$revision)))
$node->log=t('Copy of the revision from %date.',array('%date'=>theme('placeholder',format_date($node->revision_timestamp))));
$node->log=t('Copy of the revision from %date.',array('%date'=>theme('placeholder',format_date($node->revision_timestamp))));
$new_node=node_save($node);
$new_node=node_save($node);
drupal_set_message(t('%title has been rolled back to the revision from %revision-date',array('%revision-date'=>theme('placeholder',format_date($node->revision_timestamp)),'%title'=>theme('placeholder',check_plain($node->title)))));
drupal_set_message(t('%title has been reverted back to the revision from %revision-date',array('%revision-date'=>theme('placeholder',format_date($node->revision_timestamp)),'%title'=>theme('placeholder',check_plain($node->title)))));
drupal_set_message(t('You tried to roll back to an invalid revision.'),'error');
drupal_set_message(t('You tried to revert to an invalid revision.'),'error');
}
}
drupal_goto('node/'.$nid.'/revisions');
drupal_goto('node/'.$nid.'/revisions');
}
}
...
@@ -1377,7 +1368,7 @@ function node_revision_delete($nid, $revision) {
...
@@ -1377,7 +1368,7 @@ function node_revision_delete($nid, $revision) {
*/
*/
functionnode_revision_list($node){
functionnode_revision_list($node){
$revisions=array();
$revisions=array();
$result=db_query('SELECT r.vid, r.title, r.log, r.uid, n.vid AS current_vid, r.timestamp, u.name FROM {node_revisions} r LEFT JOIN {node} n ON n.vid = r.vid INNER JOIN {users} u ON u.uid = r.uid WHERE r.nid = %d ORDER BY r.timestamp ASC',$node->nid);
$result=db_query('SELECT r.vid, r.title, r.log, r.uid, n.vid AS current_vid, r.timestamp, u.name FROM {node_revisions} r LEFT JOIN {node} n ON n.vid = r.vid INNER JOIN {users} u ON u.uid = r.uid WHERE r.nid = %d ORDER BY r.timestamp DESC',$node->nid);
$row[]=array('data'=>t('%date by %username',array('%date'=>l(format_date($revision->timestamp,'small'),"node/$node->nid"),'%username'=>theme('username',$revision)))
$row[]=t('%date by %username',array('%date'=>l(format_date($revision->timestamp,'small'),"node/$node->nid/revisions/$revision->vid/view"),'%username'=>theme('username',$revision)))
$node->log=t('Copy of the revision from %date.',array('%date'=>theme('placeholder',format_date($node->revision_timestamp))));
$node->log=t('Copy of the revision from %date.',array('%date'=>theme('placeholder',format_date($node->revision_timestamp))));
$new_node=node_save($node);
$new_node=node_save($node);
drupal_set_message(t('%title has been rolled back to the revision from %revision-date',array('%revision-date'=>theme('placeholder',format_date($node->revision_timestamp)),'%title'=>theme('placeholder',check_plain($node->title)))));
drupal_set_message(t('%title has been reverted back to the revision from %revision-date',array('%revision-date'=>theme('placeholder',format_date($node->revision_timestamp)),'%title'=>theme('placeholder',check_plain($node->title)))));
drupal_set_message(t('You tried to roll back to an invalid revision.'),'error');
drupal_set_message(t('You tried to revert to an invalid revision.'),'error');
}
}
drupal_goto('node/'.$nid.'/revisions');
drupal_goto('node/'.$nid.'/revisions');
}
}
...
@@ -1377,7 +1368,7 @@ function node_revision_delete($nid, $revision) {
...
@@ -1377,7 +1368,7 @@ function node_revision_delete($nid, $revision) {
*/
*/
functionnode_revision_list($node){
functionnode_revision_list($node){
$revisions=array();
$revisions=array();
$result=db_query('SELECT r.vid, r.title, r.log, r.uid, n.vid AS current_vid, r.timestamp, u.name FROM {node_revisions} r LEFT JOIN {node} n ON n.vid = r.vid INNER JOIN {users} u ON u.uid = r.uid WHERE r.nid = %d ORDER BY r.timestamp ASC',$node->nid);
$result=db_query('SELECT r.vid, r.title, r.log, r.uid, n.vid AS current_vid, r.timestamp, u.name FROM {node_revisions} r LEFT JOIN {node} n ON n.vid = r.vid INNER JOIN {users} u ON u.uid = r.uid WHERE r.nid = %d ORDER BY r.timestamp DESC',$node->nid);