projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/platal-0.10.2'
[platal.git]
/
include
/
rss.inc.php
diff --git
a/include/rss.inc.php
b/include/rss.inc.php
index
9d38d31
..
f292fe8
100644
(file)
--- a/
include/rss.inc.php
+++ b/
include/rss.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
8
Polytechnique.org *
+ * Copyright (C) 2003-200
9
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 *
@@
-23,20
+23,20
@@
function init_rss($template, $alias, $hash, $require_uid = true)
{
$page =& Platal::page();
$page->changeTpl($template, NO_SKIN);
{
$page =& Platal::page();
$page->changeTpl($template, NO_SKIN);
- $u
id
= Platal::session()->tokenAuth($alias, $hash);
- if (
empty($uid
)) {
+ $u
ser
= Platal::session()->tokenAuth($alias, $hash);
+ if (
is_null($user
)) {
if ($require_uid) {
exit;
} else {
if ($require_uid) {
exit;
} else {
- $u
id
= null;
+ $u
ser
= null;
}
}
if ($template) {
$page->assign('rss_hash', $hash);
}
}
if ($template) {
$page->assign('rss_hash', $hash);
-
header('Content-Type: application/rss+xml; charset=utf8'
);
+
pl_content_headers("application/rss+xml"
);
}
}
- return
$uid
;
+ return
is_null($user) ? null : $user->id()
;
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: