[interchange-cvs] interchange - jon modified
dist/lib/UI/pages/include/page_editor
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Mon Aug 15 23:03:22 EDT 2005
User: jon
Date: 2005-08-16 03:03:21 GMT
Modified: dist/lib/UI/pages/include page_editor
Log:
Fix rare bug that caused certain pages to display gibberish in the page
editor due to interpolation problems.
Revision Changes Path
1.16 +10 -28 interchange/dist/lib/UI/pages/include/page_editor
rev 1.16, prev_rev 1.15
Index: page_editor
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/include/page_editor,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- page_editor 13 Feb 2004 15:01:01 -0000 1.15
+++ page_editor 16 Aug 2005 03:03:21 -0000 1.16
@@ -460,18 +460,9 @@
[else]
[page-calc]
- $page_content = <<'EoPA';
-[page-param CONTENT]
-EoPA
- $page_preamble = <<'EoPB';
-[page-param PREAMBLE]
-EoPB
- $page_postamble = <<'EoPC';
-[page-param POSTAMBLE]
-EoPC
- for(\$page_content, \$page_preamble, \$page_postamble) {
- chop $$_;
- }
+ $page_content = $Row->{CONTENT};
+ $page_preamble = $Row->{PREAMBLE};
+ $page_postamble = $Row->{POSTAMBLE};
return;
[/page-calc]
@@ -519,21 +510,12 @@
</div>
[/components]
-[calcn]
- $page_content = <<'EoPA';
-[page-param CONTENT]
-EoPA
- $page_preamble = <<'EoPB';
-[page-param PREAMBLE]
-EoPB
- $page_postamble = <<'EoPC';
-[page-param POSTAMBLE]
-EoPC
- for(\$page_content, \$page_preamble, \$page_postamble) {
- chop $$_;
- }
+[page-calc]
+ $page_content = $Row->{CONTENT};
+ $page_preamble = $Row->{PREAMBLE};
+ $page_postamble = $Row->{POSTAMBLE};
return;
-[/calcn]
+[/page-calc]
[if !scratch CONTENT_shown]
@@ -734,9 +716,9 @@
[components]
[if cgi ui_content_pos]
<script>
- visible([calc]
+ visible([calcn]
$CGI->{ui_content_pos} + 1
- [/calc], 'comp')
+ [/calcn], 'comp')
</script>
[else]
[if-comp-param !code]
More information about the interchange-cvs
mailing list