t_a/cavepaintingsFork
1
Fork 0
forked from Cavemanon/cavepaintings
Code Issues Pull Requests Packages Projects Releases Wiki Activity

requestcontext stuff is messy, go back to globals :(

Browse Source
This commit is contained in:
Shish
2009-05-11 07:04:33 -07:00
parent e592ee4c59
commit bb84a735a2
57 changed files with 407 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/image/main.php
View File

@ -168,7 +168,7 @@ class ImageIO implements Extension {
/*
* Check for an existing image
*/
$existing = Image::by_hash($config, $database, $image->hash);
$existing = Image::by_hash($image->hash);
if(!is_null($existing)) {
$handler = $config->get_string("upload_collision_handler");
if($handler == "merge") {
@ -204,7 +204,7 @@ class ImageIO implements Extension {
private function send_file($image_id, $type) {
global $config;
global $database;
$image = Image::by_id($config, $database, $image_id);
$image = Image::by_id($image_id);
global $page;
if(!is_null($image)) {