Changes from trunk/wp-includes/pluggable.php at r10150 to branches/2.7/wp-includes/pluggable.php at r10462

File:

• branches/2.7/wp-includes/pluggable.php (modified) (5 diffs)

branches/2.7/wp-includes/pluggable.php

@@ -1211 +1211 @@
  * You must not copy the below example and paste into your wp-config.php. If you
  * need an example, then you can have a
- * {@link http://api.wordpress.org/secret-key/1.0/ secret key created} for you.
+ * {@link https://api.wordpress.org/secret-key/1.1/ secret key created} for you.
  *
  * <code>
@@ -1222 +1222 @@
  *
  * @since 2.5
- * @link http://api.wordpress.org/secret-key/1.0/ Create a Secret Key for wp-config.php
+ * @link https://api.wordpress.org/secret-key/1.1/ Create a Secret Key for wp-config.php
  *
  * @return string Salt value from either 'SECRET_KEY' or 'secret' option
@@ -1395 +1395 @@
  * @since 2.5
  *
+ * @param int $length The length of password to generate
+ * @param bool $special_chars Whether to include standard special characters 
  * @return string The random password
  **/
@@ -1528 +1530 @@
     }
 
+    if ( is_ssl() )
+        $host = 'https://secure.gravatar.com'; 
+    else
+        $host = 'http://www.gravatar.com';
+
     if ( 'mystery' == $default )
-        $default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
+        $default = "$host/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
     elseif ( 'blank' == $default )
         $default = includes_url('images/blank.gif');
@@ -1535 +1542 @@
         $default = '';
     elseif ( 'gravatar_default' == $default )
-        $default = "http://www.gravatar.com/avatar/s={$size}";
+        $default = "$host/avatar/s={$size}";
     elseif ( empty($email) )
-        $default = "http://www.gravatar.com/avatar/?d=$default&amp;s={$size}";
+        $default = "$host/avatar/?d=$default&amp;s={$size}";
     elseif ( strpos($default, 'http://') === 0 )
         $default = add_query_arg( 's', $size, $default );
 
     if ( !empty($email) ) {
-        $out = 'http://www.gravatar.com/avatar/';
+        $out = "$host/avatar/";
         $out .= md5( strtolower( $email ) );
         $out .= '?s='.$size;