Changeset 3529 for trunk/lib/MT/App/CMS.pm

Timestamp:

03/12/09 05:46:37 (9 months ago)

Author:

fumiakiy

Message:

Merging frampton to trunk. "svn merge -r3083:3217 http://code.sixapart.com/svn/movabletype/branches/frampton ."

Also merged MT.pm, mt-check.cgi and mt.php.

Files:

• trunk/lib/MT/App/CMS.pm (modified) (6 diffs)

trunk/lib/MT/App/CMS.pm

@@ -534 +534 @@
                 order      => 100,
                 code       => "${pkg}Comment::unapprove_item",
-                permission => 'manage_feedback,publish_post',
+                permission => 'edit_all_posts,manage_feedback,publish_post',
             },
         },
@@ -542 +542 @@
                 order      => 100,
                 code       => "${pkg}Comment::unapprove_item",
-                permission => 'manage_feedback,publish_post',
+                permission => 'edit_all_posts,manage_feedback,publish_post',
                 condition  => sub {
                     return 1;
@@ -1881 +1881 @@
         || ( $page->isa('MT::Template') && !$page->param('page_actions') ) )
     {
-        $param->{page_actions} ||= $app->page_actions( $app->mode );
+        # Using a sub here to delay the loading of page actions, since not all
+        # templates actually utilize them.
+        $param->{page_actions} ||= sub { $app->page_actions( $app->mode ) };
     }
 
@@ -2425 +2427 @@
         = MT::Permission->load( { blog_id => $blog_id, author_id => 0 } );
     my %default = %{ $app->config->DefaultEntryPrefs };
+    %default = map { lc $_ => $default{$_} } keys %default;
     if ( $perm && $perm->entry_prefs ) {
         $prefs = $perm->entry_prefs;
@@ -2440 +2443 @@
             my @p;
             foreach my $p ( keys %map ) {
-                push @p,
-                    $map{$p} . ':' . ( $default{$p} || $default{ lc $p } )
-                    if ( $default{$p} || $default{ lc $p } );
+                push @p, $map{$p} . ':' . $default{ lc $p }
+                    if $default{ lc $p };
             }
             $prefs = join ',', @p;
@@ -2628 +2630 @@
     foreach my $field (@fields) {
         if ( $entry->can($field) ) {
-            $entry->$field( _convert_word_chars( $app, $entry->$field ) );
+            if ( $field eq 'tags' ) {
+                my @tags
+                    = map { _convert_word_chars( $app, $_ ) } $entry->tags;
+                $entry->set_tags(@tags);
+            }
+            else {
+                $entry->$field( _convert_word_chars( $app, $entry->$field ) );
+            }
         }
     }