badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into develop

Browse source 
# Conflicts:
#	ext/cron_uploader/main.php
This commit is contained in:
Matthew Barbour 2019-06-13 13:34:44 -05:00
commit edc05b2f72
3 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/_install.php
View file

@ -56,8 +56,6 @@ date_default_timezone_set('UTC');
</div>
<pre style="display:none">
<?php }
assert_options(ASSERT_ACTIVE, 1);
assert_options(ASSERT_BAIL, 1);
// Pull in necessary files
require_once "core/exceptions.php";

2
core/imageboard/image.php
View file

@ -202,7 +202,7 @@ class Image
$yays = 0;
$nays = 0;
foreach ($tags as $tag) {
if (!preg_match("/^-?[a-zA-Z0-9_-]+$/", $tag)) {
if (!preg_match("/^-?[a-zA-Z0-9_'-]+$/", $tag)) {
return null;
}
if ($tag[0] == "-") {

16
core/util.php
View file

@ -351,17 +351,6 @@ function log_slow(): void
}
}
function score_assert_handler($file, $line, $code, $desc = null): void
{
$file = basename($file);
print("Assertion failed at $file:$line: $code ($desc)");
/*
print("<pre>");
debug_print_backtrace();
print("</pre>");
*/
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
* Request initialisation stuff *
@ -396,11 +385,6 @@ function _sanitise_environment(): void
ini_set('assert.exception', 1); // throw exceptions when failed
if (DEBUG) {
error_reporting(E_ALL);
assert_options(ASSERT_ACTIVE, 1);
assert_options(ASSERT_BAIL, 1);
assert_options(ASSERT_WARNING, 0);
assert_options(ASSERT_QUIET_EVAL, 1);
assert_options(ASSERT_CALLBACK, 'score_assert_handler');
}
$_shm_ctx = new Context();