Browse Source

Fixed ISSUE 55, patch by dotism

pecesama 17 years ago
parent
commit
9b53394db6
2 changed files with 6 additions and 5 deletions
  1. 0 3
      classes/gelato.class.php
  2. 6 2
      index.php

+ 0 - 3
classes/gelato.class.php View File

@@ -120,9 +120,6 @@ class gelato extends Conexion_Mysql {
120 120
 			$formatedText .= "	</li>\n";			
121 121
 		}
122 122
 		$formatedText .= "</ul>\n";
123
-		// Ugly path fix it ASAP 
124
-		$formatedText = str_replace("<p>","", $formatedText);
125
-		$formatedText = str_replace("</p>","", $formatedText);
126 123
 		return $formatedText;
127 124
 	}
128 125
 	

+ 6 - 2
index.php View File

@@ -89,6 +89,8 @@ $template = new plantillas($conf->template);
89 89
 								$strEnd=($conf->urlFriendly) ? "/" : "";
90 90
 								$permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
91 91
                                 
92
+								$conversation = $register["description"];
93
+								
92 94
 								$textile = new Textile();				
93 95
 								$register["description"] = $textile->TextileThis($register["description"]);
94 96
 
@@ -141,7 +143,7 @@ $template = new plantillas($conf->template);
141 143
                                                 break;
142 144
                                         case "5":
143 145
                                                 $input = array("{Date_Added}", "{Permalink}", "{Title}", "{Conversation}", "{URL_Tumble}");
144
-                                                $output = array($formatedDate, $permalink, $register["title"], $tumble->formatConversation($register["description"]), $conf->urlGelato);
146
+												$output = array($formatedDate, $permalink, $register["title"], $tumble->formatConversation($conversation), $conf->urlGelato);
145 147
                                                 
146 148
                                                 $template->cargarPlantilla($input, $output, "template_conversation");
147 149
                                                 $template->mostrarPlantilla();
@@ -187,6 +189,8 @@ $template = new plantillas($conf->template);
187 189
 				$strEnd=($conf->urlFriendly) ? "/" : "";
188 190
 				$permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd;
189 191
                 
192
+				$conversation = $register["description"];
193
+				
190 194
 				$textile = new Textile();				
191 195
 				$register["description"] = $textile->TextileThis($register["description"]);
192 196
 				
@@ -238,7 +242,7 @@ $template = new plantillas($conf->template);
238 242
                                 break;
239 243
                         case "5":
240 244
                                 $input = array("{Date_Added}", "{Permalink}", "{Title}", "{Conversation}", "{URL_Tumble}");
241
-                                $output = array($formatedDate, $permalink, $register["title"], $tumble->formatConversation($register["description"]), $conf->urlGelato);
245
+                                $output = array($formatedDate, $permalink, $register["title"], $tumble->formatConversation($conversation), $conf->urlGelato);
242 246
                                 
243 247
                                 $template->cargarPlantilla($input, $output, "template_conversation");
244 248
                                 $template->mostrarPlantilla();