projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport
[platal.git]
/
include
/
rss.inc.php
diff --git
a/include/rss.inc.php
b/include/rss.inc.php
index
5bfcffa
..
9b8b74b
100644
(file)
--- a/
include/rss.inc.php
+++ b/
include/rss.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
6
Polytechnique.org *
+ * Copyright (C) 2003-200
7
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-31,13
+31,13
@@
function _rss_encode_date($d) {
function to_rss ($s)
{
if(is_string($s)) {
function to_rss ($s)
{
if(is_string($s)) {
- return
utf8_encode(
$s);
+ return
iconv('ISO_8859-15', 'UTF8',
$s);
} else {
return $s;
}
}
} else {
return $s;
}
}
-function init_rss($template, $alias, $hash)
+function init_rss($template, $alias, $hash
, $require_uid = true
)
{
global $page;
$page->changeTpl($template, NO_SKIN);
{
global $page;
$page->changeTpl($template, NO_SKIN);
@@
-52,7
+52,11
@@
function init_rss($template, $alias, $hash)
$uid = $res->fetchOneCell();
if (empty($uid)) {
$uid = $res->fetchOneCell();
if (empty($uid)) {
- exit;
+ if ($require_uid) {
+ exit;
+ } else {
+ $uid = null;
+ }
}
header('Content-Type: application/rss+xml; charset=utf8');
}
header('Content-Type: application/rss+xml; charset=utf8');