diff options
| -rw-r--r-- | database/updates.inc | 4 | ||||
| -rw-r--r-- | modules/system.module | 9 | ||||
| -rw-r--r-- | modules/system/system.module | 9 |
3 files changed, 10 insertions, 12 deletions
diff --git a/database/updates.inc b/database/updates.inc index 10c6c5aab..c7192509e 100644 --- a/database/updates.inc +++ b/database/updates.inc @@ -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']) { diff --git a/modules/system.module b/modules/system.module index e5559180a..1785a2837 100644 --- a/modules/system.module +++ b/modules/system.module @@ -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); diff --git a/modules/system/system.module b/modules/system/system.module index e5559180a..1785a2837 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -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); |