From f05ee1844ff723a6ef08b9185763c372e14d1a0c Mon Sep 17 00:00:00 2001 From: westi Date: Fri, 8 Jan 2010 08:34:39 +0000 Subject: [PATCH] Switch to passing arrays instead of query strings to functions. Fixes #6647 props filosofo and hakre. git-svn-id: http://svn.automattic.com/wordpress/trunk@12657 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/import/wordpress.php | 2 +- wp-admin/includes/export.php | 2 +- wp-admin/options-reading.php | 4 ++-- wp-content/themes/classic/header.php | 2 +- wp-content/themes/classic/sidebar.php | 2 +- wp-content/themes/default/archives.php | 2 +- wp-content/themes/default/sidebar.php | 4 ++-- wp-includes/comment-template.php | 2 +- wp-includes/deprecated.php | 2 +- wp-trackback.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index e40f32076..d1f4b8adc 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -360,7 +360,7 @@ class WP_Import { unset( $custom_taxonomies['link_category'] ); $custom_taxonomies = array_keys( $custom_taxonomies ); - $current_terms = (array) get_terms( $custom_taxonomies, 'get=all' ); + $current_terms = (array) get_terms( $custom_taxonomies, array('get' => 'all') ); $taxonomies = array(); foreach ( $current_terms as $term ) { if ( isset( $_terms[$term->taxonomy] ) ) { diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php index 63193faa0..0a64a40b1 100644 --- a/wp-admin/includes/export.php +++ b/wp-admin/includes/export.php @@ -51,7 +51,7 @@ unset($custom_taxonomies['category']); unset($custom_taxonomies['post_tag']); unset($custom_taxonomies['link_category']); $custom_taxonomies = array_keys($custom_taxonomies); -$terms = (array) get_terms($custom_taxonomies, 'get=all'); +$terms = (array) get_terms($custom_taxonomies, array('get' => 'all')); /** * {@internal Missing Short Description}} diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index 3f3aa062e..a6cdd370e 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -41,8 +41,8 @@ include('admin-header.php');

diff --git a/wp-content/themes/classic/header.php b/wp-content/themes/classic/header.php index f16c2805f..578ff33bd 100644 --- a/wp-content/themes/classic/header.php +++ b/wp-content/themes/classic/header.php @@ -17,7 +17,7 @@ - + 'monthly', 'format' => 'link')); ?> diff --git a/wp-content/themes/classic/sidebar.php b/wp-content/themes/classic/sidebar.php index 65398d466..6cd3e8e38 100644 --- a/wp-content/themes/classic/sidebar.php +++ b/wp-content/themes/classic/sidebar.php @@ -24,7 +24,7 @@
    • - + 'monthly')); ?>
  • diff --git a/wp-content/themes/default/archives.php b/wp-content/themes/default/archives.php index 20428056b..490683913 100644 --- a/wp-content/themes/default/archives.php +++ b/wp-content/themes/default/archives.php @@ -16,7 +16,7 @@ Template Name: Archives

    Archives by Month:

      - + 'monthly')); ?>

    Archives by Subject:

    diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php index e38b0be04..892d57409 100644 --- a/wp-content/themes/default/sidebar.php +++ b/wp-content/themes/default/sidebar.php @@ -55,11 +55,11 @@
  • Archives

      - + 'monthly')); ?>
  • - Categories'); ?> + 1, 'title_li' => '

    Categories

    ')); ?>