|
@@ -63,7 +63,7 @@
|
63
|
63
|
$gelato_includes = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n";
|
64
|
64
|
$gelato_includes .= "\t<meta name=\"generator\" content=\"gelato cms ".version()."\" />\n";
|
65
|
65
|
$gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
|
66
|
|
- $gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato."/rss.php\"/>\n";
|
|
66
|
+ $gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n";
|
67
|
67
|
$gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
|
68
|
68
|
$gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/admin/css/slimbox.css\" />\n";
|
69
|
69
|
$gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/mootools.js\"></script>\n";
|
|
@@ -100,7 +100,7 @@
|
100
|
100
|
while($register = mysql_fetch_array($rs)) {
|
101
|
101
|
$formatedDate = date("M d", strtotime($register["date"])+transform_offset($conf->offsetTime));
|
102
|
102
|
if ( $dateTmp != null && $formatedDate == $dateTmp ) { $formatedDate = ""; } else { $dateTmp = $formatedDate; }
|
103
|
|
- $permalink = $conf->urlGelato."/index.php/post/".$register["id_post"]."/";
|
|
103
|
+ $permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php/post/").$register["id_post"]."/";
|
104
|
104
|
|
105
|
105
|
$textile = new Textile();
|
106
|
106
|
$register["description"] = $textile->TextileThis($register["description"]);
|
|
@@ -177,7 +177,7 @@
|
177
|
177
|
$p->limit($limit);
|
178
|
178
|
|
179
|
179
|
$p->urlFriendly('[...]');
|
180
|
|
- $p->target($conf->urlGelato."/index.php/page/[...]/");
|
|
180
|
+ $p->target($conf->urlGelato.($conf->urlFriendly?"/":"/index.php/")."page/[...]/");
|
181
|
181
|
|
182
|
182
|
$p->currentPage(isset($page_num) ? $page_num : 1);
|
183
|
183
|
$p->show();
|
|
@@ -190,7 +190,7 @@
|
190
|
190
|
$register = $tumble->getPost($id_post);
|
191
|
191
|
|
192
|
192
|
$formatedDate = date("M d", strtotime($register["date"])+transform_offset($conf->offsetTime));
|
193
|
|
- $permalink = $conf->urlGelato."/index.php/post/".$register["id_post"]."/";
|
|
193
|
+ $permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php/post/").$register["id_post"]."/";
|
194
|
194
|
|
195
|
195
|
$textile = new Textile();
|
196
|
196
|
$register["description"] = $textile->TextileThis($register["description"]);
|