Commit 25eef00f authored by Dries's avatar Dries

- Patch #48939 by Steve Ratcliffe: added missing {} to upgrade path.

parent 21eb666a
......@@ -1591,7 +1591,7 @@ function system_update_172() {
// Multi-part update
if (!isset($_SESSION['system_update_172'])) {
$_SESSION['system_update_172'] = 0;
$_SESSION['system_update_172_max'] = db_result(db_query('SELECT MAX(cid) FROM comments'));
$_SESSION['system_update_172_max'] = db_result(db_query('SELECT MAX(cid) FROM {comments}'));
}
include_once './modules/comment.module';
......@@ -1606,7 +1606,7 @@ function system_update_172() {
$thread[$i] = int2vancode((strlen($offset) - 1) * 10 + substr($offset, -1, 1));
}
$thread = implode('.', $thread) .'/';
db_query("UPDATE comments SET thread = '%s' WHERE cid = %d", $thread, $comment->cid);
db_query("UPDATE {comments} SET thread = '%s' WHERE cid = %d", $thread, $comment->cid);
}
if ($_SESSION['system_update_172'] == $_SESSION['system_update_172_max']) {
......
......@@ -62,12 +62,11 @@ function system_elements() {
$type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#form_submitted' => TRUE);
$type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#form_submitted' => FALSE);
$type['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE);
$type['password'] = array('#input' => TRUE, '#size' => 30, '#maxlength' => 64);
$type['password_confirm'] = array(
'#input' => TRUE,
$type['password'] = array('#input' => TRUE, '#size' => 30);
$type['password_confirm'] = array('#input' => TRUE,
'#value' => 'pass',
'pass1' => array('#type' => 'password', '#size' => 12, '#maxlength' => 24),
'pass2' => array('#type' => 'password', '#size' => 12, '#maxlength' => 24),
'pass1' => array('#type' => 'password', '#size' => 12),
'pass2' => array('#type' => 'password', '#size' => 12),
'#validate' => array('password_confirm_validate' => array()),
);
$type['textarea'] = array('#input' => TRUE, '#cols' => 60, '#rows' => 5);
......
......@@ -62,12 +62,11 @@ function system_elements() {
$type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#form_submitted' => TRUE);
$type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#form_submitted' => FALSE);
$type['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE);
$type['password'] = array('#input' => TRUE, '#size' => 30, '#maxlength' => 64);
$type['password_confirm'] = array(
'#input' => TRUE,
$type['password'] = array('#input' => TRUE, '#size' => 30);
$type['password_confirm'] = array('#input' => TRUE,
'#value' => 'pass',
'pass1' => array('#type' => 'password', '#size' => 12, '#maxlength' => 24),
'pass2' => array('#type' => 'password', '#size' => 12, '#maxlength' => 24),
'pass1' => array('#type' => 'password', '#size' => 12),
'pass2' => array('#type' => 'password', '#size' => 12),
'#validate' => array('password_confirm_validate' => array()),
);
$type['textarea'] = array('#input' => TRUE, '#cols' => 60, '#rows' => 5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment