Changeset 617
- Timestamp:
- 03/30/06 14:20:04 (2 years ago)
- Files:
-
- trunk/src/config/wp-config-sample.php (modified) (1 diff)
- trunk/src/lib/wp-includes/pluggable-functions.php (modified) (1 diff)
- trunk/src/lib/wp-includes/template-functions-general.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/config/wp-config-sample.php
r616 r617 15 15 // See doc/Installation.txt and doc/Subdomains.txt for more info 16 16 define('SUBDOMAINS', false); 17 define('MAINDOMAIN', 'blogs.example.com'); 17 //define('MAINDOMAIN', 'blogs.example.com'); 18 //define('COOKIEDOMAIN', '.'. MAINDOMAIN); 18 19 19 20 //log files trunk/src/lib/wp-includes/pluggable-functions.php
r614 r617 197 197 $error = "<strong>Error</strong>: An administrator cannot log in from your ip address: $ip"; 198 198 return false; 199 } elseif(1==$login->user_locked) { 199 } elseif(1==$login->user_locked) { //TODO need to return false right? -jjb 200 200 $error = "Your account is locked"; 201 201 } else { trunk/src/lib/wp-includes/template-functions-general.php
r616 r617 32 32 33 33 if ('' == $user_ID) 34 $link = '<a href="' . get_settings(' home') . '/wp-login.php">' . __('Login') . '</a>';35 else 36 $link = '<a href="' . get_settings(' home') . '/wp-login.php?action=logout">' . __('Logout') . '</a>';34 $link = '<a href="' . get_settings('siteurl') . '/login">' . __('Login') . '</a>'; 35 else 36 $link = '<a href="' . get_settings('siteurl') . '/wp-login.php?action=logout">' . __('Logout') . '</a>'; 37 37 38 38 echo apply_filters('loginout', $link);
