Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

post_custom cleanup. fixes #2160 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-01-25 07:38:43 +00:00
parent f87324b259
commit 710a6ef5b5
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
wp-includes/template-functions-post.php
View File

@ -193,61 +193,61 @@ Post-meta: Custom per-post fields.
function get_post_custom( $post_id = 0 ) {
global $id, $post_meta_cache, $wpdb;
if ( $post_id )
$id = $post_id;
if ( isset($post_meta_cache[$id]) ) {
return $post_meta_cache[$id];
} else {
if ( $meta_list = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE post_id = '$id' ORDER BY post_id, meta_key", ARRAY_A) ) {
// Change from flat structure to hierarchical:
$post_meta_cache = array();
foreach ( $meta_list as $metarow ) {
$mpid = $metarow['post_id'];
$mkey = $metarow['meta_key'];
$mval = $metarow['meta_value'];
// Force subkeys to be array type:
if ( !isset($post_meta_cache[$mpid]) || !is_array($post_meta_cache[$mpid]) )
$post_meta_cache[$mpid] = array();
if ( !isset($post_meta_cache[$mpid]["$mkey"]) || !is_array($post_meta_cache[$mpid]["$mkey"]) )
$post_meta_cache[$mpid]["$mkey"] = array();
if ( ! $post_id )
$post_id = $id;
// Add a value to the current pid/key:
$post_meta_cache[$mpid][$mkey][] = $mval;
}
return $post_meta_cache[$mpid];
if ( isset($post_meta_cache[$post_id]) )
return $post_meta_cache[$post_id];
if ( $meta_list = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE post_id = '$post_id' ORDER BY post_id, meta_key", ARRAY_A) ) {
// Change from flat structure to hierarchical:
$post_meta_cache = array();
foreach ( $meta_list as $metarow ) {
$mpid = $metarow['post_id'];
$mkey = $metarow['meta_key'];
$mval = $metarow['meta_value'];
// Force subkeys to be array type:
if ( !isset($post_meta_cache[$mpid]) || !is_array($post_meta_cache[$mpid]) )
$post_meta_cache[$mpid] = array();
if ( !isset($post_meta_cache[$mpid]["$mkey"]) || !is_array($post_meta_cache[$mpid]["$mkey"]) )
$post_meta_cache[$mpid]["$mkey"] = array();
// Add a value to the current pid/key:
$post_meta_cache[$mpid][$mkey][] = $mval;
}
return $post_meta_cache[$mpid];
}
}
function get_post_custom_keys() {
global $id, $post_meta_cache;
$custom = get_post_custom();
if ( !is_array($post_meta_cache[$id]) )
if ( ! is_array($custom) )
return;
if ( $keys = array_keys($post_meta_cache[$id]) )
if ( $keys = array_keys($custom) )
return $keys;
}
function get_post_custom_values( $key = '' ) {
global $id, $post_meta_cache;
$custom = get_post_custom();
if ( empty($key) )
return $post_meta_cache[$id];
else
return get_post_custom();
return $custom[$key];
}
function post_custom( $key = '' ) {
global $id, $post_meta_cache;
$custom = get_post_custom();
if ( 1 == count($post_meta_cache[$id][$key]) )
return $post_meta_cache[$id][$key][0];
if ( 1 == count($custom[$key]) )
return $custom[$key][0];
else
return $post_meta_cache[$id][$key];
return $custom[$key];
}
@ -258,7 +258,7 @@ function the_meta() {
if ( $keys = get_post_custom_keys() ) {
echo "<ul class='post-meta'>\n";
foreach ( $keys as $key ) {
$values = array_map('trim',$post_meta_cache[$id][$key]);
$values = array_map('trim', get_post_custom_values($key));
$value = implode($values,', ');
echo "<li><span class='post-meta-key'>$key:</span> $value</li>\n";
}