Changeset 209

Show
Ignore:
Timestamp:
08/22/05 17:13:45 (3 years ago)
Author:
donncha
Message:

Links should be owned by admin of blog.
SQL cannot join on users table.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-inst/wp-admin/link-manager.php

    r27 r209  
    642642  </tr> 
    643643<?php 
     644    // fix link owners! 
     645    $wpdb->query( "UPDATE $wpdb->links SET link_owner='" . $wpdb->blogid . "' WHERE link_owner='1'" ); 
     646 
    644647    $sql = "SELECT link_url, link_name, link_image, link_description, link_visible, 
    645             link_category AS cat_id, cat_name AS category, $wpdb->users.user_login, link_id, 
    646             link_rating, link_rel 
     648            link_category AS cat_id, cat_name AS category, link_id, link_rating, link_rel 
    647649            FROM $wpdb->links 
    648650            LEFT JOIN $wpdb->linkcategories ON $wpdb->links.link_category = $wpdb->linkcategories.cat_id 
    649             LEFT JOIN $wpdb->users ON $wpdb->users.ID = $wpdb->links.link_owner "; 
    650  
     651            WHERE link_owner = '".$current_user->data->ID."'"; 
    651652    if (isset($cat_id) && ($cat_id != 'All')) { 
    652653      $sql .= " WHERE link_category = $cat_id "; 

  • trunk/wp-inst/wp-includes/wpmu-functions.php

    r204 r209  
    185185    $wpdb->query("UPDATE $wpdb->options SET option_value = '".$admin_email."' WHERE option_name = 'admin_email'"); 
    186186 
    187     // Now drop in some default links 
    188     $wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, '".addslashes(__('Blogroll'))."')"); 
    189     $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blog.carthik.net/index.php', 'Carthik', 1, 'http://blog.carthik.net/feed/');"); 
    190     $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, 'http://blogs.linux.ie/xeer/feed/');"); 
    191     $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://zengun.org/weblog/', 'Michel', 1, 'http://zengun.org/weblog/feed/');"); 
    192     $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://boren.nu/', 'Ryan', 1, 'http://boren.nu/feed/');"); 
    193     $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://photomatt.net/', 'Matt', 1, 'http://xml.photomatt.net/feed/');"); 
    194     $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://zed1.com/journalized/', 'Mike', 1, 'http://zed1.com/journalized/feed/');"); 
    195     $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://www.alexking.org/', 'Alex', 1, 'http://www.alexking.org/blog/wp-rss2.php');"); 
    196     $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://dougal.gunters.org/', 'Dougal', 1, 'http://dougal.gunters.org/feed/');"); 
    197     $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://www.wordpress.com/', 'WordPress', 1, 'http://www.wordpress.com/feed/');"); 
    198  
    199187    // Default category 
    200188    $wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename) VALUES ('0', '".addslashes(__('Uncategorized'))."', '".sanitize_title(__('Uncategorized'))."')"); 
    …… 
    214202        $wpdb->query( $query ); 
    215203    } 
     204 
     205    // Now drop in some default links 
     206    $wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, '".addslashes(__('Blogroll'))."')"); 
     207    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_owner, link_rss) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, '$userID', 'http://blogs.linux.ie/xeer/feed/');"); 
     208    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_owner, link_rss) VALUES ('http://zengun.org/weblog/', 'Michel', 1, '$userID', 'http://zengun.org/weblog/feed/');"); 
     209    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_owner, link_rss) VALUES ('http://boren.nu/', 'Ryan', 1, '$userID', 'http://boren.nu/feed/');"); 
     210    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_owner, link_rss) VALUES ('http://photomatt.net/', 'Matt', 1, '$userID', 'http://xml.photomatt.net/feed/');"); 
     211    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_owner, link_rss) VALUES ('http://zed1.com/journalized/', 'Mike', 1, '$userID', 'http://zed1.com/journalized/feed/');"); 
     212    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_owner, link_rss) VALUES ('http://www.alexking.org/', 'Alex', 1, '$userID', 'http://www.alexking.org/blog/wp-rss2.php');"); 
     213    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_owner, link_rss) VALUES ('http://dougal.gunters.org/', 'Dougal', 1, '$userID', 'http://dougal.gunters.org/feed/');"); 
     214    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_owner, link_rss) VALUES ('http://www.wordpress.com/', 'WordPress', 1, '$userID', 'http://www.wordpress.com/feed/');"); 
     215 
    216216 
    217217    // First post