Changeset 2356

Timestamp:

05/16/08 07:45:14 (6 months ago)

Author:

takayama

Message:

Fixed BugId:79763
* When author object was not found in the context, try to load author object from entry in the context

Files:

• branches/release-38/lib/MT/Template/ContextHandlers.pm (modified) (10 diffs)
• branches/release-38/php/lib/block.mtauthoruserpicasset.php (modified) (1 diff)
• branches/release-38/php/lib/function.mtauthorauthiconurl.php (modified) (1 diff)
• branches/release-38/php/lib/function.mtauthorauthtype.php (modified) (1 diff)
• branches/release-38/php/lib/function.mtauthordisplayname.php (modified) (1 diff)
• branches/release-38/php/lib/function.mtauthoremail.php (modified) (1 diff)
• branches/release-38/php/lib/function.mtauthorid.php (modified) (1 diff)
• branches/release-38/php/lib/function.mtauthorname.php (modified) (1 diff)
• branches/release-38/php/lib/function.mtauthorurl.php (modified) (1 diff)
• branches/release-38/php/lib/function.mtauthoruserpic.php (modified) (1 diff)
• branches/release-38/php/lib/function.mtauthoruserpicurl.php (modified) (1 diff)

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

@@ -6273 +6273 @@
-sub _hdlr_author_id {
-    my ($ctx) = @_;
-
-
+
+
+
+
+
+
-    return $author->id;
-}
@@ -6290 +6294 @@
-sub _hdlr_author_name {
-    my ($ctx) = @_;
-
-
+
+
+
+
+
+
-    return $author->name;
-}
@@ -6309 +6317 @@
-        my $e = $ctx->stash('entry'); 
-        $a = $e->author if $e; 
- 
+
-    return $ctx->_no_author_error() unless $a;
-    return $a->nickname || MT->translate('(Display Name not set)', $a->id);
- 
+
-
-###########################################################################
@@ -6326 +6334 @@
-sub _hdlr_author_email {
-    my ($ctx, $args) = @_;
-
-
+
+
+
+
+
+
-    my $email = $author->email;
-    return '' unless defined $email;
@@ -6343 +6355 @@
-sub _hdlr_author_url {
-    my ($ctx) = @_;
-
-
+
+
+
+
+
+
-    my $url = $author->url;
-    return defined $url ? $url : '';
@@ -6360 +6376 @@
-sub _hdlr_author_auth_type {
-    my ($ctx) = @_;
-
-
+
+
+
+
+
+
-    my $auth_type = $author->auth_type;
-    return defined $auth_type ? $auth_type : '';
@@ -6399 +6419 @@
-sub _hdlr_author_auth_icon_url {
-    my ($ctx, $args) = @_;
-
-
+
+
+
+
+
+
-    my $size = $args->{size} || 'logo_small';
-    return $author->auth_icon_url($size);
@@ -6419 +6443 @@
-sub _hdlr_author_userpic {
-    my ($ctx) = @_;
-
-
+
+
+
+
+
+
-    return $author->userpic_html() || '';
-}
@@ -6437 +6465 @@
-sub _hdlr_author_userpic_url {
-    my ($ctx) = @_;
-
-
+
+
+
+
+
+
-    return $author->userpic_url() || '';
-}
@@ -6465 +6497 @@
-    my ($ctx, $args, $cond) = @_;
-
-
-
+
+
+
+
+
+
-    my $asset = $author->userpic or return '';
-

branches/release-38/php/lib/block.mtauthoruserpicasset.php

@@ -8 +8 @@
-function smarty_block_mtauthoruserpicasset($args, $content, &$ctx, &$repeat) {
-    $author = $ctx->stash('author');
-
+
+
+
+
+
+
+
-        return $ctx->error("No author available");
-    }

branches/release-38/php/lib/function.mtauthorauthiconurl.php

@@ -8 +8 @@
-function smarty_function_mtauthorauthiconurl($args, &$ctx) {
-    $author = $ctx->stash('author');
-
-
+
+
+
+
+
+
+
+
+
-    }
-    require_once "function.mtstaticwebpath.php";

branches/release-38/php/lib/function.mtauthorauthtype.php

@@ -8 +8 @@
-function smarty_function_mtauthorauthtype($args, &$ctx) {
-    $author = $ctx->stash('author');
-
+
+
+
+
+
+
+
+
-        return $ctx->error("No author available");
-    }

branches/release-38/php/lib/function.mtauthordisplayname.php

@@ -10 +10 @@
-    // parameters: none
-    $author = $ctx->stash('author');
+    if (empty($author)) {
+        $entry = $ctx->stash('entry');
+        if (!empty($entry)) {
+            $author = $ctx->mt->db->fetch_author($entry['entry_author_id']);
+        }
+    }
+    if (empty($author)) {
+        return $ctx->error("No author available");
+    }
-    $author_name = $author['author_nickname'];
-    $author_name or $author_name =

branches/release-38/php/lib/function.mtauthoremail.php

@@ -8 +8 @@
-function smarty_function_mtauthoremail($args, &$ctx) {
-    $author = $ctx->stash('author');
-
+
+
+
+
+
+
+
+
-        return $ctx->error("No author available");
-    }
- 
+
-}
-?>

branches/release-38/php/lib/function.mtauthorid.php

@@ -8 +8 @@
-function smarty_function_mtauthorid($args, &$ctx) {
-    $author = $ctx->stash('author');
-
+
+
+
+
+
+
+
+
-        return $ctx->error("No author available");
-    }

branches/release-38/php/lib/function.mtauthorname.php

@@ -8 +8 @@
-function smarty_function_mtauthorname($args, &$ctx) {
-    $author = $ctx->stash('author');
-
+
+
+
+
+
+
+
+
-        return $ctx->error("No author available");
-    }

branches/release-38/php/lib/function.mtauthorurl.php

@@ -8 +8 @@
-function smarty_function_mtauthorurl($args, &$ctx) {
-    $author = $ctx->stash('author');
-
+
+
+
+
+
+
+
+
-        return $ctx->error("No author available");
-    }

branches/release-38/php/lib/function.mtauthoruserpic.php

@@ -8 +8 @@
-function smarty_function_mtauthoruserpic($args, &$ctx) {
-    $author = $ctx->stash('author');
-
+
+
+
+
+
+
+
+
+
-
-    $asset_id = isset($author['author_userpic_asset_id']) ? $author['author_userpic_asset_id'] : 0;

branches/release-38/php/lib/function.mtauthoruserpicurl.php

@@ -8 +8 @@
-function smarty_function_mtauthoruserpicurl($args, &$ctx) {
-    $author = $ctx->stash('author');
-
+
+
+
+
+
+
+
+
+
+
-
-    $asset_id = isset($author['author_userpic_asset_id']) ? $author['author_userpic_asset_id'] : 0;