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

Merge commit 'origin/master' into branch_2.3

Browse Source
This commit is contained in:
Shish 2009-01-25 09:58:56 -08:00
commit dfc7411975
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/handle_pixel/main.php
View File

@ -99,8 +99,10 @@ class PixelFileHandler implements Extension {
$q = $config->get_int("thumb_quality"); $q = $config->get_int("thumb_quality");
$mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB $mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB
// convert to bitmap & back to strip metadata -- otherwise we
// can end up with 3KB of jpg data and 200KB of misc extra...
// "-limit memory $mem" broken? // "-limit memory $mem" broken?
exec("convert {$inname}[0] -geometry {$w}x{$h} -quality {$q} jpg:$outname"); exec("convert {$inname}[0] -geometry {$w}x{$h} bmp:- | convert bmp:- -quality {$q} jpg:$outname");
return true; return true;
} }

2
ext/index/main.php
View File

@ -86,7 +86,7 @@ class Index implements Extension {
send_event(new PostListBuildingEvent($event->context, $search_terms)); send_event(new PostListBuildingEvent($event->context, $search_terms));
if(!(count($search_terms) == 0 && count($images) == 0)) { if(count($search_terms) > 0 || count($images) > 0 || $page_number > 0) {
$this->theme->set_page($page_number, $total_pages, $search_terms); $this->theme->set_page($page_number, $total_pages, $search_terms);
$this->theme->display_page($event->page, $images); $this->theme->display_page($event->page, $images);
} }

14
ext/upgrade/main.php
View File

@ -3,20 +3,24 @@
class Upgrade implements Extension { class Upgrade implements Extension {
public function receive_event(Event $event) { public function receive_event(Event $event) {
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
$this->do_things(); $this->do_things($event->context);
} }
} }
private function do_things() { private function do_things($context) {
global $config; $config = $context->config;
global $database; $database = $context->database;
if(!is_numeric($config->get_string("db_version"))) { if(!is_numeric($config->get_string("db_version"))) {
$config->set_int("db_version", 2); $config->set_int("db_version", 2);
} }
if($config->get_int("db_version") < 6) { if($config->get_int("db_version") < 6) {
$database->upgrade_schema("ext/upgrade/schema.xml"); // cry :S
}
if($config->get_int("db_version") < 6) { // 7
// add column image->locked
} }
} }
} }

1
install.php
View File

@ -187,6 +187,7 @@ function create_tables($dsn) { // {{{
width INTEGER NOT NULL, width INTEGER NOT NULL,
height INTEGER NOT NULL, height INTEGER NOT NULL,
posted TIMESTAMP NOT NULL DEFAULT SCORE_NOW, posted TIMESTAMP NOT NULL DEFAULT SCORE_NOW,
locked SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N,
INDEX(owner_id), INDEX(owner_id),
INDEX(width), INDEX(width),
INDEX(height), INDEX(height),