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
 			$formatedText .= "	</li>\n";			
120
 			$formatedText .= "	</li>\n";			
121
 		}
121
 		}
122
 		$formatedText .= "</ul>\n";
122
 		$formatedText .= "</ul>\n";
123
-		// Ugly path fix it ASAP 
124
-		$formatedText = str_replace("<p>","", $formatedText);
125
-		$formatedText = str_replace("</p>","", $formatedText);
126
 		return $formatedText;
123
 		return $formatedText;
127
 	}
124
 	}
128
 	
125
 	

+ 6 - 2
index.php View File

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