Wordpress 2.6.2

[autoinstalls/wordpress.git] / wp-admin / update-links.php

diff --git a/wp-admin/update-links.php b/wp-admin/update-links.php
index 46a7f5a831df2d6471107f453f4b417a08d8d165..5fd02e062b7cae510b99d9546f6bc4860e07c83f 100644 (file)
--- a/wp-admin/update-links.php
+++ b/wp-admin/update-links.php
@@ -1,14 +1,14 @@
 <?php
 <?php

-require_once( dirname( dirname(__FILE__) ) . '/wp-config.php');
+require_once('../wp-load.php');

 require_once( ABSPATH . 'wp-includes/class-snoopy.php');
 
 if ( !get_option('use_linksupdate') )
 require_once( ABSPATH . 'wp-includes/class-snoopy.php');
 
 if ( !get_option('use_linksupdate') )

-       die(__('Feature disabled.'));
+       wp_die(__('Feature disabled.'));

 
 $link_uris = $wpdb->get_col("SELECT link_url FROM $wpdb->links");
 
 if ( !$link_uris )
 
 $link_uris = $wpdb->get_col("SELECT link_url FROM $wpdb->links");
 
 if ( !$link_uris )

-       die('No links');
+       wp_die(__('No links'));

 
 $link_uris = urlencode( join( $link_uris, "\n" ) );
 
 
 $link_uris = urlencode( join( $link_uris, "\n" ) );
 


@@ -16,29 +16,29 @@ $query_string = "uris=$link_uris";
 
 $http_request  = "POST /updated-batch/ HTTP/1.0\r\n";
 $http_request .= "Host: api.pingomatic.com\r\n";
 
 $http_request  = "POST /updated-batch/ HTTP/1.0\r\n";
 $http_request .= "Host: api.pingomatic.com\r\n";

-$http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_settings('blog_charset')."\r\n";
+$http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_option('blog_charset')."\r\n";

 $http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
 $http_request .= 'User-Agent: WordPress/' . $wp_version . "\r\n";
 $http_request .= "\r\n";
 $http_request .= $query_string;
 
 $response = '';
 $http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
 $http_request .= 'User-Agent: WordPress/' . $wp_version . "\r\n";
 $http_request .= "\r\n";
 $http_request .= $query_string;
 
 $response = '';

-if( false !== ( $fs = fsockopen('api.pingomatic.com', 80, $errno, $errstr, 5) ) ) {
+if ( false !== ( $fs = @fsockopen('api.pingomatic.com', 80, $errno, $errstr, 5) ) ) {

        fwrite($fs, $http_request);
        while ( !feof($fs) )
                $response .= fgets($fs, 1160); // One TCP-IP packet
        fclose($fs);
        fwrite($fs, $http_request);
        while ( !feof($fs) )
                $response .= fgets($fs, 1160); // One TCP-IP packet
        fclose($fs);

-    
+

        $response = explode("\r\n\r\n", $response, 2);
        $body = trim( $response[1] );
        $body = str_replace(array("\r\n", "\r"), "\n", $body);
        $response = explode("\r\n\r\n", $response, 2);
        $body = trim( $response[1] );
        $body = str_replace(array("\r\n", "\r"), "\n", $body);

-    
+

        $returns = explode("\n", $body);
        $returns = explode("\n", $body);

-    
+

        foreach ($returns as $return) :
        foreach ($returns as $return) :

-               $time = $wpdb->escape( substr($return, 0, 19) );
-               $uri = $wpdb->escape( preg_replace('/(.*?) | (.*?)/', '$2', $return) );
-               $wpdb->query("UPDATE $wpdb->links SET link_updated = '$time' WHERE link_url = '$uri'");
+               $time = substr($return, 0, 19);
+               $uri = preg_replace('/(.*?) | (.*?)/', '$2', $return);
+               $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_updated = %s WHERE link_url = %s", $time, $uri) );

        endforeach;
 }
 ?>
        endforeach;
 }
 ?>