james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/shish/shimmie2 into develop

Browse Source
This commit is contained in:
Shish 2015-01-30 03:54:31 +00:00
commit d523781481
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/handle_404/main.php
View File

@ -14,7 +14,7 @@ class Handle404 extends Extension {
// hax. // hax.
if($page->mode == "page" && (!isset($page->blocks) || $this->count_main($page->blocks) == 0)) { if($page->mode == "page" && (!isset($page->blocks) || $this->count_main($page->blocks) == 0)) {
$h_pagename = html_escape(implode('/', $event->args)); $h_pagename = html_escape(implode('/', $event->args));
$f_pagename = preg_replace("/[^a-z\.]+/", "_", $h_pagename); $f_pagename = preg_replace("/[^a-z_\-\.]+/", "_", $h_pagename);
$theme_name = $config->get_string("theme", "default"); $theme_name = $config->get_string("theme", "default");
if(file_exists("themes/$theme_name/$f_pagename") || file_exists("lib/static/$f_pagename")) { if(file_exists("themes/$theme_name/$f_pagename") || file_exists("lib/static/$f_pagename")) {

BIN
lib/static/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB