adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-04 17:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

related to #1693 solve deprecated trim and str_replace

Browse Source
This commit is contained in:
Matthieu Leproux
2022-07-19 11:57:12 +02:00
parent 97407ef5b1
commit 735b670599
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/configuration.php
+1 -1
View File
@@ -350,7 +350,7 @@ switch ($page['section'])
{
$out = array();
$order_by = trim($conf['order_by_inside_category']);
$order_by = str_replace('ORDER BY ', null, $order_by);
$order_by = str_replace('ORDER BY ', false, $order_by);
$order_by = explode(', ', $order_by);
}
include/template.class.php
+3 -3
View File
@@ -702,7 +702,7 @@ class Template
*/
function block_html_head($params, $content)
{
$content = trim($content);
$content = isset($content) ? trim($content) : '';
if ( !empty($content) )
{ // second call
$this->html_head_elements[] = $content;
@@ -718,7 +718,7 @@ class Template
*/
function block_html_style($params, $content)
{
$content = trim($content);
$content = isset($content) ? trim($content) : '';
if ( !empty($content) )
{ // second call
$this->html_style .= "\n".$content;
@@ -908,7 +908,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
*/
function block_footer_script($params, $content)
{
$content = trim($content);
$content = isset($content) ? trim($content) : '';
if ( !empty($content) )
{ // second call