summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-07-28 14:16:09 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-07-28 14:16:09 +0000
commit5ee109609eac4257fab820b3bbd4151e4d4ec26f (patch)
treee12c68afd287983755e625304ee3f7022484c29d
parent9054172078e40175543a4179864b63b562f0dab5 (diff)
Changes from WP Core.
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@89 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--wp-inst/wp-includes/wp-db.php1
-rw-r--r--wp-inst/wp-login.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/wp-inst/wp-includes/wp-db.php b/wp-inst/wp-includes/wp-db.php
index 73da0a7..29f575d 100644
--- a/wp-inst/wp-includes/wp-db.php
+++ b/wp-inst/wp-includes/wp-db.php
@@ -83,6 +83,7 @@ class wpdb {
// Format a string correctly for safe insert under all PHP conditions
function escape($string) {
+ return addslashes( $string ); // Disable rest for now, causing problems
if( !$this->dbh || version_compare( phpversion(), '4.3.0' ) == '-1' )
return mysql_escape_string( $string );
else
diff --git a/wp-inst/wp-login.php b/wp-inst/wp-login.php
index e3a8fe6..a68f239 100644
--- a/wp-inst/wp-login.php
+++ b/wp-inst/wp-login.php
@@ -228,7 +228,7 @@ if ( $error )
<p><label><?php _e('Username:') ?><br /><input type="text" name="log" id="log" value="" size="20" tabindex="1" /></label></p>
<p><label><?php _e('Password:') ?><br /> <input type="password" name="pwd" id="pwd" value="" size="20" tabindex="2" /></label></p>
<p>
- <label><input name="rememberme" type="checkbox" id="rememberme" value="forever" checked="checked" />
+ <label><input name="rememberme" type="checkbox" id="rememberme" value="forever" />
<?php _e('Remember me'); ?></label></p>
<p class="submit">
<input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> &raquo;" tabindex="3" />