Changeset 5682

Timestamp:

Apr 5, 2010, 10:49:32 PM (14 years ago)

Author:

grum

Message:

bug 1580 - remove some hard coded markup (move them to the template)

Location:

trunk

Files:

• include/functions_html.inc.php (modified) (2 diffs)
• themes/default/template/comment_list.tpl (modified) (1 diff)

trunk/include/functions_html.inc.php

@@ -200 +200 @@
   $content = preg_replace($pattern, $replacement, $content);
 
-  $content = '<div>'.$content.'</div>';
   return $content;
 }
@@ -458 +457 @@
     }
   }
-        $protocol = $_SERVER["SERVER_PROTOCOL"];
-        if ( ('HTTP/1.1' != $protocol) && ('HTTP/1.0' != $protocol) )
-                $protocol = 'HTTP/1.0';
-
-        if ( version_compare( phpversion(), '4.3.0', '>=' ) )
-  {
-                header( "$protocol $code $text", true, $code );
-        }
+  $protocol = $_SERVER["SERVER_PROTOCOL"];
+  if ( ('HTTP/1.1' != $protocol) && ('HTTP/1.0' != $protocol) )
+    $protocol = 'HTTP/1.0';
+
+  if ( version_compare( phpversion(), '4.3.0', '>=' ) )
+  {
+    header( "$protocol $code $text", true, $code );
+  }
   else
   {
-                header( "$protocol $code $text" );
-        }
+    header( "$protocol $code $text" );
+  }
   trigger_action('set_status_header', $code, $text);
 }

trunk/themes/default/template/comment_list.tpl

@@ -41 +41 @@
       <a name="edit_comment"></a>
       <form  method="post" action="{$comment.U_EDIT}" class="filter" id="editComment">
-        <fieldset>
-          <legend>{'Edit a comment'|@translate}</legend>
-          <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
-          <input type="hidden" name="key" value="{$comment.KEY}">
-          <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
-          <input class="submit" type="submit" value="{'Submit'|@translate}">
-        </fieldset>
+  <fieldset>
+    <legend>{'Edit a comment'|@translate}</legend>
+    <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
+    <input type="hidden" name="key" value="{$comment.KEY}">
+    <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
+    <input class="submit" type="submit" value="{'Submit'|@translate}">
+  </fieldset>
       </form>
-      {else}      
-      <blockquote>{$comment.CONTENT}</blockquote>
+      {else}
+      <blockquote><div>{$comment.CONTENT}</div></blockquote>
       {/if}
     </div>