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 2018-11-10 13:10:22 +00:00
commit 16d0abb546
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -35,7 +35,7 @@ install:
fi fi
- if [[ "$DB" == "sqlite" ]]; then - if [[ "$DB" == "sqlite" ]]; then
echo '<?php define("DATABASE_DSN", "sqlite:data/shimmie.sqlite");' > data/config/auto_install.conf.php ; echo '<?php define("DATABASE_DSN", "sqlite:data/shimmie.sqlite");' > data/config/auto_install.conf.php ;
fi fi
- composer install - composer install
- php index.php - php index.php

2
core/page.php
View File

@ -337,7 +337,7 @@ class Page {
$css_files = array_merge( $css_files = array_merge(
zglob("lib/shimmie.css"), zglob("lib/shimmie.css"),
zglob("ext/{".ENABLED_EXTS."}/style.css"), zglob("ext/{".ENABLED_EXTS."}/style.css"),
zglob("themes/$theme_name/style.css"), zglob("themes/$theme_name/style.css")
); );
foreach($css_files as $css) { foreach($css_files as $css) {
$css_latest = max($css_latest, filemtime($css)); $css_latest = max($css_latest, filemtime($css));

3
ext/report_image/main.php
View File

@ -209,7 +209,8 @@ class ReportImage extends Extension {
$all_reports = $database->get_all(" $all_reports = $database->get_all("
SELECT image_reports.*, users.name AS reporter_name SELECT image_reports.*, users.name AS reporter_name
FROM image_reports FROM image_reports
JOIN users ON reporter_id = users.id"); JOIN users ON reporter_id = users.id
ORDER BY image_reports.id DESC");
if(is_null($all_reports)) $all_reports = array(); if(is_null($all_reports)) $all_reports = array();
$reports = array(); $reports = array();

2
ext/rule34/script.js
View File

@ -51,7 +51,7 @@ var forceDesktop = false;
function toggleDesktop() { function toggleDesktop() {
if(forceDesktop) { if(forceDesktop) {
var viewport = document.querySelector("meta[name=viewport]"); var viewport = document.querySelector("meta[name=viewport]");
viewport.setAttribute('content', 'width=512, initial-scale=1.0'); viewport.setAttribute('content', 'width=512');
Cookies.set("ui-desktop", "false"); Cookies.set("ui-desktop", "false");
} }
else { else {