diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 4dc9f1d61d..f5e3ed44e3 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -13,7 +13,7 @@ $post_stati = array( // array( adj, noun )
'private' => array(__('Private'), __('Private pages'), __('Private (%s)'))
);
-$post_status_label = __('Pages');
+$post_status_label = __('Manage Pages');
$post_status_q = '';
if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) {
$post_status_label = $post_stati[$_GET['post_status']][1];
@@ -66,7 +66,7 @@ unset($status_links);
-
+
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index ed90e71f01..c939c9c712 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -58,29 +58,50 @@ if ( isset($_GET['deleted']) ) {
+
+
+
+
'
' . __('Name') . ' | ',
@@ -88,7 +109,6 @@ $link_columns = array(
'categories' => '
' . __('Categories') . ' | ',
'rel' => '
' . __('rel') . ' | ',
'visible' => '
' . __('Visible') . ' | ',
- 'action' => '
' . __('Action') . ' | ',
);
$link_columns = apply_filters('manage_link_columns', $link_columns);
?>
@@ -96,7 +116,10 @@ $link_columns = apply_filters('manage_link_columns', $link_columns);
$cat_id, 'hide_invisible' => 0, 'orderby' => $sqlorderby, 'hide_empty' => 0);
+if ( $_GET['s'] )
+ $args['search'] = $_GET['s'];
+$links = get_bookmarks( $args );
if ( $links ) {
?>
@@ -109,10 +132,10 @@ if ( $links ) {
+ |
- |
@@ -132,10 +155,12 @@ if ( $links ) {
++ $i;
$style = ($i % 2) ? '' : ' class="alternate"';
?>>';
foreach($link_columns as $column_name=>$column_display_name) {
switch($column_name) {
case 'name':
- ?>link_name; ?> $link->link_name ";
echo $link->link_description . " | ";
break;
case 'url':
@@ -162,10 +187,6 @@ if ( $links ) {
case 'visible':
?> | " . __('Edit') . '';
- echo "link_id.'&action=delete', 'delete-bookmark_' . $link->link_id ) . "' class='delete:the-list:link-$link->link_id delete'>" . __('Delete') . ' | ';
- break;
default:
?>
link_id); ?> |
@@ -174,7 +195,6 @@ if ( $links ) {
}
}
- echo ' | ';
echo "\n
\n";
}
?>
@@ -183,7 +203,6 @@ if ( $links ) {
-')" />
diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index ccd6f1bcfb..a886af2558 100644
--- a/wp-includes/bookmark.php
+++ b/wp-includes/bookmark.php
@@ -111,7 +111,7 @@ function get_bookmarks($args = '') {
'limit' => -1, 'category' => '',
'category_name' => '', 'hide_invisible' => 1,
'show_updated' => 0, 'include' => '',
- 'exclude' => ''
+ 'exclude' => '', 'search' => ''
);
$r = wp_parse_args( $args, $defaults );
@@ -160,6 +160,11 @@ function get_bookmarks($args = '') {
$category = $category->term_id;
}
+ if ( ! empty($search) ) {
+ $search = like_escape($search);
+ $search = " AND ( (link_url LIKE '%$search%') OR (link_name LIKE '%$search%') OR (link_description LIKE '%$search%') ) ";
+ }
+
$category_query = '';
$join = '';
if ( !empty($category) ) {
@@ -207,7 +212,7 @@ function get_bookmarks($args = '') {
$visible = "AND link_visible = 'Y'";
$query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
- $query .= " $exclusions $inclusions";
+ $query .= " $exclusions $inclusions $search";
$query .= " ORDER BY $orderby $order";
if ($limit != -1)
$query .= " LIMIT $limit";