Index: /trunk/src/config/wp-config-sample.php
===================================================================
--- /trunk/src/config/wp-config-sample.php (revision 616)
+++ /trunk/src/config/wp-config-sample.php (revision 617)
@@ -15,5 +15,6 @@
// See doc/Installation.txt and doc/Subdomains.txt for more info
define('SUBDOMAINS', false);
-define('MAINDOMAIN', 'blogs.example.com');
+//define('MAINDOMAIN', 'blogs.example.com');
+//define('COOKIEDOMAIN', '.'. MAINDOMAIN);
//log files
Index: /trunk/src/lib/wp-includes/template-functions-general.php
===================================================================
--- /trunk/src/lib/wp-includes/template-functions-general.php (revision 616)
+++ /trunk/src/lib/wp-includes/template-functions-general.php (revision 617)
@@ -32,7 +32,7 @@
if ('' == $user_ID)
- $link = '' . __('Login') . '';
- else
- $link = '' . __('Logout') . '';
+ $link = '' . __('Login') . '';
+ else
+ $link = '' . __('Logout') . '';
echo apply_filters('loginout', $link);
Index: /trunk/src/lib/wp-includes/pluggable-functions.php
===================================================================
--- /trunk/src/lib/wp-includes/pluggable-functions.php (revision 614)
+++ /trunk/src/lib/wp-includes/pluggable-functions.php (revision 617)
@@ -197,5 +197,5 @@
$error = "Error: An administrator cannot log in from your ip address: $ip";
return false;
- } elseif(1==$login->user_locked) {
+ } elseif(1==$login->user_locked) { //TODO need to return false right? -jjb
$error = "Your account is locked";
} else {