diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-11 11:27:43 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-11 11:27:43 +0000 |
| commit | b92deb93cf1b425d3b0da113dce719ff3e7af839 (patch) | |
| tree | 4579958b1d0169cf8d86ad2e55286c7b5be90148 /wp-inst/xmlrpc.php | |
| parent | aa750edffae8aeb649b0b2f15900db988e588de7 (diff) | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@430 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/xmlrpc.php')
| -rw-r--r-- | wp-inst/xmlrpc.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-inst/xmlrpc.php b/wp-inst/xmlrpc.php index 235c57b..753a8c8 100644 --- a/wp-inst/xmlrpc.php +++ b/wp-inst/xmlrpc.php @@ -324,7 +324,7 @@ class wp_xmlrpc_server extends IXR_Server { /* warning: here we make the assumption that the weblog's URI is on the same server */ $filename = get_settings('home') . '/'; - $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); + $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); $f = fopen($filename, 'r'); $content = fread($f, filesize($filename)); @@ -359,7 +359,7 @@ class wp_xmlrpc_server extends IXR_Server { /* warning: here we make the assumption that the weblog's URI is on the same server */ $filename = get_settings('home') . '/'; - $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); + $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); if ($f = fopen($filename, 'w+')) { fwrite($f, $content); @@ -1147,7 +1147,7 @@ class wp_xmlrpc_server extends IXR_Server { $error_code = -1; // Check if the page linked to is in our site - $pos1 = strpos($pagelinkedto, str_replace('http://', '', str_replace('www.', '', get_settings('home')))); + $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_settings('home'))); if( !$pos1 ) return new IXR_Error(0, 'Is there no link to us?'); |