WordPress.org
Get WordPress

Make WordPress Core

Ticket #1372: wp-secure-schema.patch

File wp-secure-schema.patch, 4.1 KB (added by michaelmoore, 21 years ago)

  • wp-includes/functions.php

     
    679679                $link_url = $matches[2][$i];
    680680                $link_text = $matches[4][$i];
    681681                $content = str_replace($link_match, $link_text.' '.$link_number, $content);
    682                 $link_url = (strtolower(substr($link_url,0,7)) != 'http://') ? get_settings('home') . $link_url : $link_url;
     682                $link_url = ((strtolower(substr($link_url,0,7)) != 'http://')||(strtolower(substr($link_url,0,7)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
    683683                $links_summary .= "\n".$link_number.' '.$link_url;
    684684        }
    685685        $content = strip_tags($content);
    … …  
    18431843        }       
    18441844}
    18451845
    1846 ?>
    1847  No newline at end of file
     1846?>

  • xmlrpc.php

     
    283283
    284284          /* warning: here we make the assumption that the weblog's URI is on the same server */
    285285          $filename = get_settings('home') . '/';
    286           $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
     286          $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
    287287
    288288          $f = fopen($filename, 'r');
    289289          $content = fread($f, filesize($filename));
    … …  
    317317
    318318          /* warning: here we make the assumption that the weblog's URI is on the same server */
    319319          $filename = get_settings('home') . '/';
    320           $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
     320          $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
    321321
    322322          if ($f = fopen($filename, 'w+')) {
    323323            fwrite($f, $content);
    … …  
    10901090                $error_code = -1;
    10911091
    10921092                // Check if the page linked to is in our site
    1093                 $pos1 = strpos($pagelinkedto, str_replace('http://', '', str_replace('www.', '', get_settings('home'))));
     1093                $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_settings('home')));
    10941094                if(!$pos1) {
    10951095                        return new IXR_Error(0, '');
    10961096                }
    … …  
    11761176                        preg_match('|<title>([^<]*?)</title>|is', $linea, $matchtitle);
    11771177                }
    11781178                $pos2 = strpos($linea, $pagelinkedto);
    1179                 $pos3 = strpos($linea, str_replace('http://www.', 'http://', $pagelinkedto));
     1179                $pos3 = strpos($linea, str_replace(array('http://www.','https://www.'), array('http://','https://'), $pagelinkedto));
    11801180                if (is_integer($pos2) || is_integer($pos3)) {
    11811181                        // The page really links to us :)
    11821182                        $pos4 = (is_integer($pos2)) ? $pos2 : $pos3;
    … …  
    12701270
    12711271$wp_xmlrpc_server = new wp_xmlrpc_server();
    12721272
    1273 ?>
    1274  No newline at end of file
     1273?>

  • wp-admin/install.php

     
    66require_once('../wp-config.php');
    77require_once('./upgrade-functions.php');
    88
    9 $guessurl = str_replace('/wp-admin/install.php?step=2', '', 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) );
     9$schema = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS'])=='on')?'https://':'http://';
     10$guessurl = str_replace('/wp-admin/install.php?step=2', '', $schema . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) );
    1011
    1112if (isset($_GET['step']))
    1213        $step = $_GET['step'];

  • wp-admin/upgrade-schema.php

     
    151151function populate_options() {
    152152        global $wpdb;
    153153
    154         $guessurl = preg_replace('|/wp-admin/.*|i', '', 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
     154        $schema = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS'])=='on')?'https://':'http://';
     155        $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
    155156        add_option('siteurl', $guessurl, __('WordPress web address'));
    156157        add_option('blogname', __('My Weblog'), __('Blog title'));
    157158        add_option('blogdescription', __('Just another WordPress weblog'), __('Short tagline'));