mirror of
https://github.com/typecho/typecho.git
synced 2025-03-19 17:39:42 +01:00
merge new fixes from master
This commit is contained in:
parent
f206d852bd
commit
b73187f12c
@ -112,8 +112,8 @@ class Cookie
|
||||
public static function setOptions(array $options)
|
||||
{
|
||||
self::$domain = $options['domain'] ?: self::$domain;
|
||||
self::$secure = $options['secure'] ? (bool) $options['secure'] : false;
|
||||
self::$httponly = $options['httponly'] ? (bool) $options['httponly'] : false;
|
||||
self::$secure = !!$options['secure'];
|
||||
self::$httponly = !!$options['httponly'];
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -396,6 +396,29 @@ class Archive extends Contents
|
||||
$this->feedUrl = $feedUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the value of feed
|
||||
* Deprecated since 1.3.0
|
||||
*
|
||||
* @deprecated 1.3.0
|
||||
* @return null
|
||||
*/
|
||||
public function getFeed()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the value of feed
|
||||
* Deprecated since 1.3.0
|
||||
*
|
||||
* @deprecated 1.3.0
|
||||
* @param null $feed
|
||||
*/
|
||||
public function setFeed($feed)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Query|null
|
||||
*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user