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

backports

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@895 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2008-06-09 11:23:02 +00:00
parent 94725f1266
commit c4fdf771ee
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/random_image/main.php
View File

@ -29,6 +29,11 @@ class RandomImage extends Extension {
$event->page->set_data(file_get_contents($image->get_image_filename())); $event->page->set_data(file_get_contents($image->get_image_filename()));
} }
} }
if($event->get_arg(0) == "view") {
if(!is_null($image)) {
send_event(new DisplayingImageEvent($image, $event->page));
}
}
} }
} }
} }

8
core/util.inc.php
View File

@ -128,6 +128,14 @@ EOD;
} }
} }
function check_cli() {
if(isset($_SERVER['REMOTE_ADDR'])) {
print "This script is to be run from the command line only.";
exit;
}
$_SERVER['REMOTE_ADDR'] = "127.0.0.1";
}
function get_thumbnail_size($orig_width, $orig_height) { function get_thumbnail_size($orig_width, $orig_height) {
global $config; global $config;

4
index.php
View File

@ -9,7 +9,6 @@ version_check();
sanitise_environment(); sanitise_environment();
// load base files // load base files
$files = array_merge(glob("core/*.php"), glob("ext/*/main.php")); $files = array_merge(glob("core/*.php"), glob("ext/*/main.php"));
foreach($files as $filename) { foreach($files as $filename) {
@ -40,8 +39,7 @@ if($custom_themelets) {
$m = array(); $m = array();
foreach($custom_themelets as $filename) { foreach($custom_themelets as $filename) {
if(preg_match("/themes\/$_theme\/(.*)\.theme\.php/",$filename,$m) if(preg_match("/themes\/$_theme\/(.*)\.theme\.php/",$filename,$m)
&& array_contains($themelets, "ext/{$m[1]}/theme.php")) && array_contains($themelets, "ext/{$m[1]}/theme.php")) {
{
require_once $filename; require_once $filename;
} }
} }