firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

PHP5.2 호환성 문제 수정

Browse Source
This commit is contained in:
thisgun
2022-06-13 15:26:10 +09:00
parent 958abc9a91
commit bc56480db5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/common.lib.php
View File

@ -1577,6 +1577,10 @@ function sql_data_seek($result, $offset=0)
mysql_data_seek($result, $offset); mysql_data_seek($result, $offset);
} }
function _callback_sql_show_tables($m){
return "show tables like '".str_replace("`", "", $m[1])."'";
}
// mysqli_query 와 mysqli_error 를 한꺼번에 처리 // mysqli_query 와 mysqli_error 를 한꺼번에 처리
// mysql connect resource 지정 - 명랑폐인님 제안 // mysql connect resource 지정 - 명랑폐인님 제안
function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null) function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
@ -1595,11 +1599,7 @@ function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
$sql = preg_replace("#^select.*from.*where.*`?information_schema`?.*#i", "select 1", $sql); $sql = preg_replace("#^select.*from.*where.*`?information_schema`?.*#i", "select 1", $sql);
if (preg_match("#^desc(?:ribe)?\s+(.*)#i", $sql)) { if (preg_match("#^desc(?:ribe)?\s+(.*)#i", $sql)) {
$sql = preg_replace_callback("#^desc(?:ribe)?\s+(.*)#i", $sql = preg_replace_callback("#^desc(?:ribe)?\s+(.*)#i", '_callback_sql_show_tables', trim($sql));
function ($m) {
return "show tables like '".str_replace("`", "", $m[1])."'";
}, trim($sql)
);
} }
$is_debug = get_permission_debug_show(); $is_debug = get_permission_debug_show();

8
plugin/htmlpurifier/HTMLPurifier.standalone.php
View File

@ -21914,11 +21914,11 @@ class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
$string = $uri->toString(); $string = $uri->toString();
// always available // always available
$this->replace['%s'] = $string; $this->replace['%s'] = $string;
$this->replace['%r'] = $context->get('EmbeddedURI', true)?: ''; $this->replace['%r'] = $context->get('EmbeddedURI', true);
$token = $context->get('CurrentToken', true) ?: ''; $token = $context->get('CurrentToken', true);
$this->replace['%n'] = $token ? $token->name : ''; $this->replace['%n'] = $token ? $token->name : '';
$this->replace['%m'] = $context->get('CurrentAttr', true) ?: ''; $this->replace['%m'] = $context->get('CurrentAttr', true);
$this->replace['%p'] = $context->get('CurrentCSSProperty', true) ?: ''; $this->replace['%p'] = $context->get('CurrentCSSProperty', true);
// not always available // not always available
if ($this->secretKey) { if ($this->secretKey) {
$this->replace['%t'] = hash_hmac("sha256", $string, $this->secretKey); $this->replace['%t'] = hash_hmac("sha256", $string, $this->secretKey);