← Back to branch summary

~ubuntu-branches/debian/sid/wordpress/sid

« back to all changes in this revision

Viewing changes to wp-admin/includes/taxonomy.php

  • Committer: Package Import Robot
  • Author(s): Raphaël Hertzog
  • Date: 2013-11-13 20:41:09 UTC
  • mfrom: (1.2.30)
  • Revision ID: package-import@ubuntu.com-20131113204109-eab47hggfl05n16g
Tags: 3.7.1+dfsg-1
http://bugs.debian.org/722552
http://bugs.debian.org/723074
* New upstream release.
* Enable usage of php5-mysqlnd as an alternative to php5-mysql.
  Closes: #722552
* Improve wp-setup to cope with plugins/themes directories with
  spaces. Thanks to Oskar Liljeblad <oskar@osk.mine.nu> for the patch.
  Closes: #723074
* Refresh patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/taxonomy.php
34
34
 * @return unknown
35
35
 */
36
36
function get_category_to_edit( $id ) {
37
 
        $category = get_category( $id, OBJECT, 'edit' );
 
37
        $category = get_term( $id, 'category', OBJECT, 'edit' );
 
38
        _make_cat_compat( $category );
38
39
        return $category;
39
40
}
40
41
 
155
156
                return false;
156
157
 
157
158
        // First, get all of the original fields
158
 
        $category = get_category($cat_ID, ARRAY_A);
 
159
        $category = get_term( $cat_ID, 'category', ARRAY_A );
 
160
        _make_cat_compat( $category );
159
161
 
160
162
        // Escape data pulled from DB.
161
163
        $category = wp_slash($category);