Index: /branches/release-39/lib/MT/Object.pm
===================================================================
--- /branches/release-39/lib/MT/Object.pm (revision 2500)
+++ /branches/release-39/lib/MT/Object.pm (revision 2530)
@@ -1238,10 +1238,16 @@
my $obj = shift;
my $oc = MT->request('object_cache') or return;
+
+ my $pk = $obj->primary_key;
+ $pk = join ":", @$pk if ref $pk;
+ my $key = ref($obj). ':' . $pk;
+
if (@_) {
- $oc = $oc->{"$obj"};
+ $oc = $oc->{$key};
delete $oc->{shift} if $oc;
} else {
- delete $oc->{"$obj"};
- }
+ delete $oc->{$key};
+ }
+ 1;
}
Index: /branches/release-39/lib/MT/Template/ContextHandlers.pm
===================================================================
--- /branches/release-39/lib/MT/Template/ContextHandlers.pm (revision 2496)
+++ /branches/release-39/lib/MT/Template/ContextHandlers.pm (revision 2530)
@@ -10037,4 +10037,5 @@
if ($args->{lastn} || $args->{offset}) {
$args{'direction'} = 'descend';
+ $so = 'descend';
} else {
$args{'direction'} = 'ascend';
Index: /branches/release-39/lib/MT/Util.pm
===================================================================
--- /branches/release-39/lib/MT/Util.pm (revision 2317)
+++ /branches/release-39/lib/MT/Util.pm (revision 2530)
@@ -923,5 +923,5 @@
sub make_unique_basename {
my ($entry) = @_;
- my $blog = $entry->blog;
+ my $blog = MT::Blog->load($entry->blog_id);
my $title = $entry->title;
$title = '' if !defined $title;
Index: /branches/release-39/t/35-tags.dat
===================================================================
--- /branches/release-39/t/35-tags.dat (revision 2518)
+++ /branches/release-39/t/35-tags.dat (revision 2530)
@@ -163,7 +163,7 @@
{ "r" : "1", "t" : "", "e" : "5"}, #112
{ "r" : "1", "t" : "", "e" : "127.0.0.1"}, #113
-{ "r" : "1", "t" : "", "e" : "John Doe,Comment 3,Chucky Dee"}, #114
+{ "r" : "1", "t" : ",", "e" : "John Doe,Comment 3,Chucky Dee,"}, #114
{ "r" : "1", "t" : "", "e" : "johnd@doe.com"}, #115
-{ "r" : "1", "t" : "", "e" : "![\"Author](\"/cgi-bin/mt-static/images/comment/typekey_logo.png\")
"}, #116
+{ "r" : "1", "t" : "", "e" : "![\"Author](\"http://localhost/mt-static/images/comment/typekey_logo.png\")
"}, #116
{ "r" : "1", "t" : "", "e" : "http://john.doe.com/"}, #117
{ "r" : "1", "t" : "", "e" : "1"}, #118
@@ -253,5 +253,5 @@
{ "r" : "1", "t" : "in category", "e" : "in category"}, #201
{ "r" : "1", "t" : "", "e" : ""}, #202
-{ "r" : "1", "t" : "--;", "e" : "Archive Index-http://narnia.na/nana/archives.html-index;Atom-http://narnia.na/nana/atom.xml-index;JavaScript-http://narnia.na/nana/mt.js-index;Main Index-http://narnia.na/nana/-index;RSD-http://narnia.na/nana/rsd.xml-index;RSS-http://narnia.na/nana/rss.xml-index;Stylesheet-http://narnia.na/nana/styles.css-index;"}, #203
+{ "r" : "1", "t" : "--;", "e" : "Archive Index-http://narnia.na/nana/archives.html-index;Feed - Recent Entries-http://narnia.na/nana/atom.xml-index;JavaScript-http://narnia.na/nana/mt.js-index;Main Index-http://narnia.na/nana/-index;RSD-http://narnia.na/nana/rsd.xml-index;Stylesheet-http://narnia.na/nana/styles.css-index;"}, #203
{ "r" : "1", "t" : "email needed", "e" : ""}, #204
{ "r" : "1", "t" : "comment html allowed", "e" : "comment html allowed"}, #205
@@ -273,6 +273,6 @@
{ "r" : "1", "t" : "", "e" : "January 31, 1978 11:59 PMJanuary 31, 1965 11:59 PMJanuary 31, 1964 11:59 PMJanuary 31, 1963 11:59 PMJanuary 31, 1962 11:59 PMJanuary 31, 1961 11:59 PM"}, #221
{ "r" : "1", "t" : "", "e" : "February 4, 1978 11:59 PMFebruary 6, 1965 11:59 PMFebruary 1, 1964 11:59 PMFebruary 2, 1963 11:59 PMFebruary 3, 1962 11:59 PMFebruary 4, 1961 11:59 PM"}, #222
-{ "r" : "1", "t" : ",", "e" : "0,0,1.5,"}, #223
-{ "r" : "1", "t" : ",: trusteduntrusted", "e" : ",Chucky Dee: trusted,Comment 3,John Doe: trusted"}, #224
+{ "r" : "1", "t" : ",", "e" : "1.5,0,0,"}, #223
+{ "r" : "1", "t" : ",: trusteduntrusted", "e" : ",John Doe: trusted,Comment 3,Chucky Dee: trusted"}, #224
{ "r" : "1", "t" : " ", "e" : "anemones 4,grandpa 6,rain 2,strolling 6,verse 1"}, #225
{ "r" : "1", "t" : "", "e" : "6,2,6"}, #226
@@ -406,5 +406,5 @@
{ "r" : "1", "t" : ";", "e" : "3;2;"}, #354
{ "r" : "1", "t" : "", "e" : "EntryMonthlyWeeklyDailyCategoryPage"}, #355
-{ "r" : "1", "t" : "<$MTEntryID$>:210;", "e" : "1:0;0;0;8:0;7:6:2;1;0;5:0;4:"}, #356
+{ "r" : "1", "t" : "<$MTEntryID$>:210;", "e" : "1:0;0;0;8:0;7:6:1;2;0;5:0;4:"}, #356
{ "r" : "1", "t" : "<$MTPageMore$>", "e" : "I don't have much to say,
"}, #357
{ "r" : "1", "t" : "<$MTAssetlabel$>", "e" : "Image photo"}, #358
@@ -412,5 +412,5 @@
{ "r" : "1", "t" : "<$MTAssetID$>", "e" : "2"}, #360
{ "r" : "1", "t" : "<$MTAuthorAuthType$>:<$MTAuthorAuthIconURL$>;", "e" : "MT:http://localhost/mt-static/images/comment/mt_logo.png;MT:http://localhost/mt-static/images/comment/mt_logo.png;"}, #361
-{ "r" : "1", "t" : "<$MTCommenterAuthType$>:<$MTCommenterAuthIconURL$>;", "e" : ":;:;:;:;MT:http://localhost/mt-static/images/comment/mt_logo.png;MT:http://localhost/mt-static/images/comment/mt_logo.png;:;TypeKey:http://localhost/mt-static/images/comment/typekey_logo.png;:;"}, #362
+{ "r" : "1", "t" : "<$MTCommenterAuthType$>:<$MTCommenterAuthIconURL$>;", "e" : ":;:;:;:;:;MT:http://localhost/mt-static/images/comment/mt_logo.png;MT:http://localhost/mt-static/images/comment/mt_logo.png;:;TypeKey:http://localhost/mt-static/images/comment/typekey_logo.png;"}, #362
{ "r" : "1", "t" : ";", "e" : "Melody;Chuck D;Bob D;"}, #363
{ "r" : "1", "t" : ";", "e" : "Hiro Nakamura;"}, #364
Index: /branches/release-39/t/lib/MT/Test.pm
===================================================================
--- /branches/release-39/t/lib/MT/Test.pm (revision 2451)
+++ /branches/release-39/t/lib/MT/Test.pm (revision 2530)
@@ -200,4 +200,5 @@
$blog->commenter_authenticators('enabled_TypeKey');
$blog->save() or die "Couldn't save blog 1: ". $blog->errstr;
+ MT::ObjectDriver::Driver::Cache::RAM->clear_cache();
diag "Saved blog";
@@ -316,4 +317,5 @@
diag "Saved entry #1";
}
+ $entry->clear_cache();
$entry = MT::Entry->load(2);
@@ -337,4 +339,5 @@
diag "Saved entry #2";
}
+ $entry->clear_cache();
$entry = MT::Entry->load(3);
@@ -360,4 +363,5 @@
diag "Saved entry #3";
}
+ $entry->clear_cache();
require MT::Trackback;