diff options
-rw-r--r-- | index.php | 21 | ||||
-rw-r--r-- | tpl/default/includes.html | 2 |
2 files changed, 1 insertions, 22 deletions
@@ -225,27 +225,6 @@ function setup_login_state($conf) | |||
225 | } | 225 | } |
226 | $userIsLoggedIn = setup_login_state($conf); | 226 | $userIsLoggedIn = setup_login_state($conf); |
227 | 227 | ||
228 | /** | ||
229 | * PubSubHubbub protocol support (if enabled) [UNTESTED] | ||
230 | * (Source: http://aldarone.fr/les-flux-rss-shaarli-et-pubsubhubbub/ ) | ||
231 | * | ||
232 | * @param ConfigManager $conf Configuration Manager instance. | ||
233 | */ | ||
234 | function pubsubhub($conf) | ||
235 | { | ||
236 | $pshUrl = $conf->get('config.PUBSUBHUB_URL'); | ||
237 | if (!empty($pshUrl)) | ||
238 | { | ||
239 | include_once './publisher.php'; | ||
240 | $p = new Publisher($pshUrl); | ||
241 | $topic_url = array ( | ||
242 | index_url($_SERVER).'?do=atom', | ||
243 | index_url($_SERVER).'?do=rss' | ||
244 | ); | ||
245 | $p->publish_update($topic_url); | ||
246 | } | ||
247 | } | ||
248 | |||
249 | // ------------------------------------------------------------------------------------------ | 228 | // ------------------------------------------------------------------------------------------ |
250 | // Session management | 229 | // Session management |
251 | 230 | ||
diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 91c6ca3b..0350ef66 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <link type="text/css" rel="stylesheet" href="css/font-awesome.min.css" /> | 11 | <link type="text/css" rel="stylesheet" href="css/font-awesome.min.css" /> |
12 | <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" /> | 12 | <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" /> |
13 | <link type="text/css" rel="stylesheet" href="css/shaarli.css" /> | 13 | <link type="text/css" rel="stylesheet" href="css/shaarli.css" /> |
14 | {if="is_file('inc/user.css')"} | 14 | {if="is_file('data/user.css')"} |
15 | <link type="text/css" rel="stylesheet" href="data/user.css#" /> | 15 | <link type="text/css" rel="stylesheet" href="data/user.css#" /> |
16 | {/if} | 16 | {/if} |
17 | {loop="$plugins_includes.css_files"} | 17 | {loop="$plugins_includes.css_files"} |