summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--wp-inst/wp-admin/admin-functions.php3
-rw-r--r--wp-inst/wp-admin/index.php4
-rw-r--r--wp-inst/wp-admin/link-import.php2
-rw-r--r--wp-inst/wp-admin/wp-admin.css4
-rw-r--r--wp-inst/wp-content/themes/default/functions.php2
-rw-r--r--wp-inst/wp-includes/comment-functions.php8
-rw-r--r--wp-inst/wp-includes/functions.php2
-rw-r--r--wp-inst/wp-includes/template-functions-post.php7
-rw-r--r--wp-inst/wp-settings.php5
9 files changed, 22 insertions, 15 deletions
diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php
index 6fa3a3b..7f516da 100644
--- a/wp-inst/wp-admin/admin-functions.php
+++ b/wp-inst/wp-admin/admin-functions.php
@@ -1670,7 +1670,7 @@ function wp_handle_upload(&$file, $overrides = false) {
'avi' => 'video/avi',
'mov|qt' => 'video/quicktime',
'mpeg|mpg|mpe' => 'video/mpeg',
- 'txt|c|cc|h|php' => 'text/plain',
+ 'txt|c|cc|h' => 'text/plain',
'rtx' => 'text/richtext',
'css' => 'text/css',
'htm|html' => 'text/html',
@@ -1750,6 +1750,7 @@ function wp_handle_upload(&$file, $overrides = false) {
} else {
$number = '';
$filename = str_replace('#', '_', $file['name']);
+ $filename = str_replace(array('\\', "'"), '', $filename);
if ( empty($ext) )
$ext = '';
else
diff --git a/wp-inst/wp-admin/index.php b/wp-inst/wp-admin/index.php
index 3a4e552..cbef7fd 100644
--- a/wp-inst/wp-admin/index.php
+++ b/wp-inst/wp-admin/index.php
@@ -19,7 +19,7 @@ $rss = @fetch_rss('http://feeds.technorati.com/cosmos/rss/?url='. trailingslashi
if ( isset($rss->items) && 0 != count($rss->items) ) {
?>
<div id="incominglinks">
-<h3><?php _e('Incoming Links'); ?> <cite><a href="http://www.technorati.com/cosmos/search.html?url=<?php echo trailingslashit(get_option('home')); ?>&amp;partner=wordpress"><?php _e('More'); ?> &raquo;</a></cite></h3>
+<h3><?php _e('Incoming Links'); ?> <cite><a href="http://www.technorati.com/search/<?php echo trailingslashit(get_option('home')); ?>?partner=wordpress"><?php _e('More'); ?> &raquo;</a></cite></h3>
<ul>
<?php
$rss->items = array_slice($rss->items, 0, 10);
@@ -33,7 +33,7 @@ foreach ($rss->items as $item ) {
<?php
$comments = $wpdb->get_results("SELECT comment_author, comment_author_url, comment_ID, comment_post_ID FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 5");
-$numcomments = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_approved = '0'");
+$numcomments = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
if ( $comments || $numcomments ) :
?>
diff --git a/wp-inst/wp-admin/link-import.php b/wp-inst/wp-admin/link-import.php
index 817d48f..34d7b01 100644
--- a/wp-inst/wp-admin/link-import.php
+++ b/wp-inst/wp-admin/link-import.php
@@ -77,7 +77,7 @@ foreach ($categories as $category) {
}
$opml_url = $_POST['opml_url'];
- if (isset($opml_url) && $opml_url != '') {
+ if (isset($opml_url) && $opml_url != '' && $opml_url != 'http://') {
$blogrolling = true;
}
else // try to get the upload file.
diff --git a/wp-inst/wp-admin/wp-admin.css b/wp-inst/wp-admin/wp-admin.css
index 6e2c66a..2576ba9 100644
--- a/wp-inst/wp-admin/wp-admin.css
+++ b/wp-inst/wp-admin/wp-admin.css
@@ -745,6 +745,10 @@ table .vers, table .name {
display:block;
}
+#grabit {
+ width: 188px;
+}
+
* html #themeselect {
padding: 0px 3px;
height: 22px;
diff --git a/wp-inst/wp-content/themes/default/functions.php b/wp-inst/wp-content/themes/default/functions.php
index 23482a2..5587a48 100644
--- a/wp-inst/wp-content/themes/default/functions.php
+++ b/wp-inst/wp-content/themes/default/functions.php
@@ -128,7 +128,7 @@ function kubrick_add_theme_page() {
}
add_action('admin_head', 'kubrick_theme_page_head');
}
- add_theme_page("Kubrick Theme Options", "Current Theme Options", 'edit_themes', basename(__FILE__), 'kubrick_theme_page');
+ add_theme_page('Customize Header', 'Header Image and Color', 'edit_themes', basename(__FILE__), 'kubrick_theme_page');
}
function kubrick_theme_page_head() {
diff --git a/wp-inst/wp-includes/comment-functions.php b/wp-inst/wp-includes/comment-functions.php
index 7bbbaac..8b9c30e 100644
--- a/wp-inst/wp-includes/comment-functions.php
+++ b/wp-inst/wp-includes/comment-functions.php
@@ -543,20 +543,20 @@ function pings_open() {
// Non-template functions
function get_lastcommentmodified($timezone = 'server') {
- global $tablecomments, $cache_lastcommentmodified, $pagenow, $wpdb;
+ global $cache_lastcommentmodified, $pagenow, $wpdb;
$add_seconds_blog = get_settings('gmt_offset') * 3600;
$add_seconds_server = date('Z');
$now = current_time('mysql', 1);
if ( !isset($cache_lastcommentmodified[$timezone]) ) {
switch(strtolower($timezone)) {
case 'gmt':
- $lastcommentmodified = $wpdb->get_var("SELECT comment_date_gmt FROM $tablecomments WHERE comment_date_gmt <= '$now' ORDER BY comment_date_gmt DESC LIMIT 1");
+ $lastcommentmodified = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_date_gmt <= '$now' ORDER BY comment_date_gmt DESC LIMIT 1");
break;
case 'blog':
- $lastcommentmodified = $wpdb->get_var("SELECT comment_date FROM $tablecomments WHERE comment_date_gmt <= '$now' ORDER BY comment_date_gmt DESC LIMIT 1");
+ $lastcommentmodified = $wpdb->get_var("SELECT comment_date FROM $wpdb->comments WHERE comment_date_gmt <= '$now' ORDER BY comment_date_gmt DESC LIMIT 1");
break;
case 'server':
- $lastcommentmodified = $wpdb->get_var("SELECT DATE_ADD(comment_date_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $tablecomments WHERE comment_date_gmt <= '$now' ORDER BY comment_date_gmt DESC LIMIT 1");
+ $lastcommentmodified = $wpdb->get_var("SELECT DATE_ADD(comment_date_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->comments WHERE comment_date_gmt <= '$now' ORDER BY comment_date_gmt DESC LIMIT 1");
break;
}
$cache_lastcommentmodified[$timezone] = $lastcommentmodified;
diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index fc2e23d..681c4cb 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -931,7 +931,7 @@ function make_url_footnote($content) {
$link_url = $matches[2][$i];
$link_text = $matches[4][$i];
$content = str_replace($link_match, $link_text.' '.$link_number, $content);
- $link_url = ((strtolower(substr($link_url,0,7)) != 'http://')||(strtolower(substr($link_url,0,7)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
+ $link_url = ((strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,7)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
$links_summary .= "\n".$link_number.' '.$link_url;
}
$content = strip_tags($content);
diff --git a/wp-inst/wp-includes/template-functions-post.php b/wp-inst/wp-includes/template-functions-post.php
index 673abcd..eaf2696 100644
--- a/wp-inst/wp-includes/template-functions-post.php
+++ b/wp-inst/wp-includes/template-functions-post.php
@@ -231,10 +231,13 @@ function get_post_custom_keys() {
}
-function get_post_custom_values($key='') {
+function get_post_custom_values( $key = '' ) {
global $id, $post_meta_cache;
- return $post_meta_cache[$id][$key];
+ if ( empty($key) )
+ return $post_meta_cache[$id];
+ else
+ return get_post_custom();
}
diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php
index 319be00..9e9705d 100644
--- a/wp-inst/wp-settings.php
+++ b/wp-inst/wp-settings.php
@@ -216,9 +216,8 @@ if ( file_exists(ABSPATH . 'wp-content/object-cache.php') )
else
require (ABSPATH . WPINC . '/cache.php');
-// For now, disable persistent caching by default. To enable, comment out
-// the following line.
-//define('DISABLE_CACHE', true);
+// To disable persistant caching, add the below line to your wp-config.php file, uncommented of course.
+// define('DISABLE_CACHE', true);
wp_cache_init();
generated by cgit (git 2.34.1) at 2025-05-23 19:50:28 +0000