Changeset 3537 for trunk

Timestamp:

03/12/09 13:19:38 (9 months ago)

Author:

fumiakiy

Message:

Mergeing from the latest sockfish. "svn merge -r3527:3535 http://code.sixapart.com/svn/movabletype/branches/sockfish/ ."

Location:

trunk

Files:

• lib/MT/L10N/nl.pm (modified) (2 diffs)
• php/lib/block.mtifcommenterregistrationallowed.php (modified) (1 diff)
• php/mt.php (modified) (3 diffs)

trunk/lib/MT/L10N/nl.pm

@@ -1754 +1754 @@
         'Couldn\'t get public key from url provided' => 'Kon geen publieke sleutel vinden via de opgegeven url',
         'No public key could be found to validate registration.' => 'Er kon geen publieke sleutel gevonden worden om de registratie te valideren.',
-        'TypePad signature verif\'n returned [_1] in [_2] seconds verifying [_3] with [_4]' => 'TypePad signatuur verificatie retourneerde [_1] in [_2] seconden bij het verifiï¿œren van [_3] met [_4]',
+        'TypePad signature verif\'n returned [_1] in [_2] seconds verifying [_3] with [_4]' => 'TypePad signatuur verificatie retourneerde [_1] in [_2] seconden bij het verifiëren van [_3] met [_4]',
         'The TypePad signature is out of date ([_1] seconds old). Ensure that your server\'s clock is correct' => 'De TypePad signatuur is vervallen ([_1] seconden oud).  Kijk na of de klok van uw server juist staat.',
 
@@ -2649 +2649 @@
         'Require E-mail Address for Comments via TypePad' => 'E-mail adres vereisen voor reacties via TypePad',
         'If enabled, visitors must allow their TypePad account to share e-mail address when commenting.' => 'Indien ingeschakeld, moeten bezoekers die met hun TypePad account zijn aangemeld hun e-mail adres met u delen als ze een reactie willen achterlaten.',
-        'One or more Perl module may be missing to use this authentication method.' => 'Mogelijk ontbreken ￜￜn of meer Perl modules om deze authenticatiemethode te kunnen gebruiken.',
+        'One or more Perl module may be missing to use this authentication method.' => 'Mogelijk ontbreken één of meer Perl modules om deze authenticatiemethode te kunnen gebruiken.',
         'Setup TypePad' => 'TypePad instellen',
         'OpenID providers disabled' => 'OpenID providers uitgeschakeld',

trunk/php/lib/block.mtifcommenterregistrationallowed.php

@@ -7 +7 @@
 
 function smarty_block_mtifcommenterregistrationallowed($args, $content, &$ctx, &$repeat) {
-    $registration = $ctx->mt->config('CommenterRegistration')
+    $registration = $ctx->mt->config('commenterregistration');
     $blog = $ctx->stash('blog');
-    return $registration['Allow'] && ($blog && $blog['blog_allow_commenter_regist'])
+    $allow = $registration['allow'] && ($blog && $blog['blog_allow_commenter_regist']);
+    if (!isset($content)) {
+        return $ctx->_hdlr_if($args, $content, $ctx, $repeat, $allow);
+    } else {
+        return $ctx->_hdlr_if($args, $content, $ctx, $repeat);
+    }
 }
 ?>

trunk/php/mt.php

@@ -202 +202 @@
         $cfg = array();
         $type_array = array('pluginpath', 'alttemplate', 'outboundtrackbackdomains', 'memcachedservers');
+        $type_hash  = array('commenterregistration');
         if ($fp = file($file)) {
             foreach ($fp as $line) {
@@ -212 +213 @@
                         if (in_array($key, $type_array)) {
                             $cfg[$key][] = $value;
+                        }
+                        elseif (in_array($key, $type_hash)) {
+                            $hash = preg_split('/\=/', $value, 2);
+                            $cfg[$key][strtolower(trim($hash[0]))] = trim($hash[1]);
                         } else {
                             $cfg[$key] = $value;
@@ -385 +390 @@
         isset($cfg['usersessioncookietimeout']) or
             $cfg['usersessioncookietimeout'] = 60*60*4;
+        isset($cfg['commenterregistration']) or
+            $cfg['commenterregistration'] = array('allow' => 1 );
     }