Changeset 1333

Timestamp:

01/23/08 08:06:50 (7 months ago)

Author:

takayama

Message:

Fixed BugId:65812
* Changed scheme_version to 4.0037
* Added basename column to MT_Author

• Assigning basename when author saved
  

* Changed to use MTAuthorBasename instead of MTAuthorDisplayName

Files:

• branches/release-29/build/mt-dists/default.mk (modified) (1 diff)
• branches/release-29/lib/MT/Author.pm (modified) (2 diffs)
• branches/release-29/lib/MT/Core.pm (modified) (1 diff)
• branches/release-29/lib/MT/Template/ContextHandlers.pm (modified) (3 diffs)
• branches/release-29/lib/MT/Upgrade.pm (modified) (1 diff)
• branches/release-29/lib/MT/Util.pm (modified) (1 diff)
• branches/release-29/lib/MT/WeblogPublisher.pm (modified) (1 diff)
• branches/release-29/php/lib/block.mtarchivelist.php (modified) (1 diff)
• branches/release-29/php/lib/block.mtauthornext.php (modified) (2 diffs)
• branches/release-29/php/lib/block.mtauthorprevious.php (modified) (2 diffs)

branches/release-29/build/mt-dists/default.mk

@@ -2 +2 @@
-
-PRODUCT_VERSION = 4.1
-6
+7
-API_VERSION = 4.1
-

branches/release-29/lib/MT/Author.pm

@@ -36 +36 @@
-        'auth_type' => 'string(255)',
-        'userpic_asset_id' => 'integer',
+        'basename' => 'string(255)',
-    },
-    defaults => {
@@ -210 +211 @@
-    my $auth = shift;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
+        # Generate basename
+        my $basename = MT::Util::make_unique_author_basename($auth);
+        $auth->basename($basename);
-    }
-

branches/release-29/lib/MT/Core.pm

@@ -496 +496 @@
-            'UserpicMaxUpload' => { default => 0 },
-            'UserpicThumbnailSize' => { default => 100 },
+
+            # Basename settings
+            'AuthorBansenameLimit' => { default => 30 },
-        },
-        upgrade_functions => \&load_upgrade_fns,

branches/release-29/lib/MT/Template/ContextHandlers.pm

@@ -285 +285 @@
-            AuthorNext => \&_hdlr_author_prev_next,
-            AuthorPrevious => \&_hdlr_author_prev_next,
+            AuthorBasename => \&_hdlr_author_basename,
-
-            BlogID => \&_hdlr_blog_id,
@@ -2366 +2367 @@
-    }
-    my %f = (
-DisplayN
-DisplayN
-DisplayN
+Basen
+Basen
+Basen
-        'b' => "<MTEntryBasename $sep>",
-        '-b' => "<MTEntryBasename separator='-'>",
@@ -3150 +3151 @@
-    local $ctx->{__stash}{asset} = $asset;
-    $builder->build($ctx, $tok, { %$cond });
+}
+
+sub _hdlr_author_basename {
+    my $author = $_[0]->stash('author')
+        or return $_[0]->_no_author_error('MTAuthorBasename');
+    my $name = $author->basename;
+    $name = MT::Util::make_unique_author_basename($author) if !$name;
+    return $name;
-}
-

branches/release-29/lib/MT/Upgrade.pm

@@ -776 +776 @@
-                    $blog->page_layout($layout);
-                    $blog->save;
+                },
+            },
+        },
+        'core_set_author_basename' => {
+            version_limit => 4.0037,
+            priority => 3.2,
+            updater => {
+                type => 'author',
+                label => 'Assigning author basename...',
+                condition => sub {
+                    $_[0]->type == 1;
+                },
+                code => sub {
+                    my ($author) = @_;
+                    my $basename = MT::Util::make_unique_author_basename($author);
+                    $author->basename($basename);
+                    $author->save;
-                },
-            },

branches/release-29/lib/MT/Util.pm

@@ -910 +910 @@
-}
-
+sub make_unique_author_basename {
+    my ($author) = @_;
+    my $name = MT::Util::dirify($author->nickname);
+    return "author" . $author->id if $name !~ /\w/;
+
+    my $limit = MT->instance->config('AuthorBasenameLimit');
+    $limit = 15 if $limit < 15; $limit = 250 if $limit > 250;
+    my $base = substr($name, 0, $limit);
+    $base =~ s/_+$//;
+    my $i = 1;
+    my $base_copy = $base;
+
+    my $author_class = ref $author;
+    while ($author_class->count({ basename => $base })) {
+        $base = $base_copy . '_' . $i++;
+    }
+    $base;
+}
+
-sub archive_file_for {
-    MT->instance->publisher->archive_file_for(@_);

branches/release-29/lib/MT/WeblogPublisher.pm

@@ -2898 +2898 @@
-    return "" unless $this_author;
-
-    my $name = dirify( $this_author->nickname );
-    $name = "author" . $this_author->id if $name !~ /\w/;
-    if ( !$file_tmpl ) {
-
+this_author->base
-    }
-    $file;

branches/release-29/php/lib/block.mtarchivelist.php

@@ -2 +2 @@
-require_once "archive_lib.php";
-function smarty_block_mtarchivelist($args, $content, &$ctx, &$repeat) {
-
+, 'author'
-    global $_archivers;
+
-    if (!isset($content)) {
-        require_once("archive_lib.php");

branches/release-29/php/lib/block.mtauthornext.php

@@ -9 +9 @@
-    static $_next_cache = array();
-    if (!isset($content)) {
-
+
+
-        $author = $ctx->stash('author');
-        if ($author) {
@@ -25 +26 @@
-                              'need_entry' => 1);
-                list($next_author) = $ctx->mt->db->fetch_authors($args);
-
+
+
+
+
+
-            }
-
+
+
-        }
-        $ctx->stash('conditional', isset($next_author));
-        $ctx->stash('else_content', null);
-    } else {
-
-
-
-
+
-    }
-    return $content;

branches/release-29/php/lib/block.mtauthorprevious.php

@@ -9 +9 @@
-    static $_prev_cache = array();
-    if (!isset($content)) {
-
+
+
-        $author = $ctx->stash('author');
-        if ($author) {
@@ -25 +26 @@
-                              'need_entry' => 1);
-                list($prev_author) = $ctx->mt->db->fetch_authors($args);
-
+
+
+
+
+
-            }
-            $ctx->stash('author', $prev_author);
-        }
-        $ctx->stash('conditional', isset($prev_author));
-        $ctx->stash('else_content', null);
-    } else {
-
-
-
-
+
-    }
-    return $content;