Changeset 875

Timestamp:

12/11/06 07:48:06 (2 years ago)

Author:

fumiakiy

Message:

Fixed a bug which forced to overwrite mtview.php everytime cfg_archive screen was saved. BugId: 45815

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (3 diffs)
• branches/wheeljack/tmpl/cms/cfg_archives.tmpl (modified) (2 diffs)

branches/wheeljack/lib/MT/App/CMS.pm

@@ -8199 +8199 @@
-    $param{dynamic_all} = $blog->custom_dynamic_templates eq 'all';
-    $param{show_build_options} = $app->config('ObjectDriver') =~ m/^DBI::(postgres|sqlite|mysql)/;
+    my $mtview_path = File::Spec->catfile($blog->site_path(), "mtview.php");
+    if (-f $mtview_path) {
+        open my($fh), $mtview_path;
+        while (my $line = <$fh>) {
+            $param{dynamic_caching} = 1 if $line =~ m/^\s*\$mt->caching\s*=\s*true;/i;
+            $param{dynamic_conditional} = 1 if $line =~ /^\s*\$mt->conditional\s*=\s*true;/i;
+        }
+        close $fh;
+    }
-    $iter = MT::Template->load_iter({ blog_id => $blog->id });
-    my(@tmpl);
@@ -10321 +10330 @@
-                open(my $mv, "<$mtview_path");
-                while (my $line = <$mv>) {
-"//$line" if ($line !~ /<\?(?:php)?|\?>/
+$line if ($line !~ m!^//|<\?(?:php)?|\?>!
-                }
-                close $mv;
@@ -10332 +10341 @@
-            my $cache_code = $cache ? "\n    \$mt->caching = true;" : '';
-            my $conditional_code = $conditional ? "\n    \$mt->conditional = true;" : '';
-
-
-
+
+
-    include('$mtphp_path');
-    \$mt = new MT($blog_id, '$config');$cache_code$conditional_code
-    \$mt->view();
+NEW_MTVIEW
+            if ($new_mtview ne substr($mv_contents, 0, length($new_mtview))) {
+                $mv_contents =~ s!\n!\n//!gs;
+                my $mtview = <<MTVIEW;
+<?php
+$new_mtview
+$mv_contents
-?>
-MTVIEW
-
-
-
-
-
-
+
+
+
+
+
+
+
-        }; if ($@) { print STDERR $@; } 
-

branches/wheeljack/tmpl/cms/cfg_archives.tmpl

@@ -121 +121 @@
-        } else {
-            fld.style.display = 'block';
-            TC.Client.call({
-                'load': function(c, response) {
-                    var result;
-                    try {
-                        result = eval('('+response+')');
-                        var cache = getByID("dynamic_cache");
-                        if (cache)
-                            cache.checked = result.cache;
-                        var condition = getByID("dynamic_conditional");
-                        if (condition)
-                            condition.checked = result.conditional;
-                        var progress = getByID("progress-bar");
-                        if (progress) {
-                            progress.style.display = "none";
-                        } else {
-                        }
-                        var area = getByID('dynamic_options');
-                        if (area) {
-                            area.style.display = "block";
-                        }
-                    } catch ( e ) {
-                        alert(e.message);
-                    }
-                },
-                'method': 'POST',
-                'uri': '<TMPL_VAR NAME=MT_URL>',
-                'arguments': { '__mode': 'js_check_mtview',
-                    'blog_id': '<TMPL_VAR NAME=BLOG_ID>',
-                    'magic_token': '<TMPL_VAR NAME=MAGIC_TOKEN>'}
-            });
-        }
-    }
@@ -363 +333 @@
-<option value="all"<TMPL_IF NAME=DYNAMIC_ALL> selected="selected"</TMPL_IF>><MT_TRANS phrase="Build all templates dynamically"></option>
-</select>
-
-
-
+
-<p><MT_TRANS phrase="Optional Settings for Dynamic Publishing:"> <a href="#" onclick="return openManual('blog_settings_publishing', 'dynamic_publishing_options')" class="help">?</a></p>
-<div class="field">
-/><label for="dynamic_cache"><MT_TRANS phrase="Enable caching"></label> <input type="checkbox" id="dynamic_conditional" name="dynamic_conditional" 
+<TMPL_IF NAME=DYNAMIC_CACHING>checked="checked"</TMPL_IF>/><label for="dynamic_cache"><MT_TRANS phrase="Enable caching"></label> <input type="checkbox" id="dynamic_conditional" name="dynamic_conditional" <TMPL_IF NAME=DYNAMIC_CONDITIONAL>checked="checked"</TMPL_IF>
-</div>
-</div><a href="#" onclick="return openManual('blog_settings_publishing', 'dynamic_publishing')" class="help">?</a>
-</div>
-</div>
-</TMPL_IF>