fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 04:24:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix strict count() behavior in PHP 7.2

Browse source
This commit is contained in:
Kijin Sung 2017-12-01 01:49:20 +09:00
parent 6f35f5bafc
commit 3992b4b5bc
6 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/legacy.php
View file

@ -158,7 +158,7 @@ function executeQueryArray($query_id, $args = NULL, $arg_columns = NULL)
{ {
$oDB = DB::getInstance(); $oDB = DB::getInstance();
$output = $oDB->executeQuery($query_id, $args, $arg_columns); $output = $oDB->executeQuery($query_id, $args, $arg_columns);
if(isset($output->data) && !is_array($output->data) && count($output->data) > 0) if(isset($output->data) && !is_array($output->data) && countobj($output->data) > 0)
{ {
$output->data = array($output->data); $output->data = array($output->data);
} }

2
modules/addon/addon.admin.model.php
View file

@ -305,7 +305,7 @@ class addonAdminModel extends addon
$val->options = array($val->options); $val->options = array($val->options);
} }
for($i = 0, $c = count($val->options); $i < $c; $i++) for($i = 0, $c = countobj($val->options); $i < $c; $i++)
{ {
$obj->options[$i] = new stdClass(); $obj->options[$i] = new stdClass();
$obj->options[$i]->title = $val->options[$i]->title->body; $obj->options[$i]->title = $val->options[$i]->title->body;

5
modules/board/skins/xedition/_read.html
View file

@ -101,10 +101,9 @@
</div> </div>
<div class="tns"> <div class="tns">
{@ $tag_list = $oDocument->get('tag_list') } {@ $tag_list = $oDocument->get('tag_list') }
<span class="tags" cond="count($tag_list)"> <span class="tags" cond="$tag_list">
<i class="xi-tags"></i> <i class="xi-tags"></i>
<!--@for($i=0;$i<count($tag_list);$i++)--> <!--@foreach($tag_list as $tag)-->
{@ $tag = $tag_list[$i]; }
<a href="{getUrl('search_target','tag','search_keyword',$tag,'document_srl','')}" class="tag" rel="tag">{htmlspecialchars($tag)}</a><span>,</span> <a href="{getUrl('search_target','tag','search_keyword',$tag,'document_srl','')}" class="tag" rel="tag">{htmlspecialchars($tag)}</a><span>,</span>
<!--@end--> <!--@end-->
</span> </span>

4
modules/board/skins/xedition/list.html
View file

@ -2,9 +2,9 @@
<include cond="$oDocument->isExists()" target="_read.html" /> <include cond="$oDocument->isExists()" target="_read.html" />
<ul class="cTab" cond="$module_info->use_category=='Y'"> <ul class="cTab" cond="$module_info->use_category=='Y'">
<li class="on"|cond="!$category"><a href="{getUrl('category','','page','')}">{$lang->total}</a></li> <li class="on"|cond="!$category"><a href="{getUrl('category','','page','')}">{$lang->total}</a></li>
<li loop="$cate_list=>$key,$val" class="on"|cond="$category==$val->category_srl"><a href="{getUrl(category,$val->category_srl,'document_srl','', 'page', '')}">{$val->title}<!--<em cond="$val->document_count">[{$val->document_count}]</em>--></a> <li loop="$cate_list=>$key,$val" class="on"|cond="$category==$val->category_srl"><a href="{getUrl('category',$val->category_srl,'document_srl','', 'page', '')}">{$val->title}<!--<em cond="$val->document_count">[{$val->document_count}]</em>--></a>
<ul cond="count($val->children)"> <ul cond="count($val->children)">
<li loop="$val->children=>$idx,$item" class="on_"|cond="$category==$item->category_srl"><a href="{getUrl(category,$item->category_srl,'document_srl','', 'page', '')}">{$item->title}<!--<em cond="$val->document_count">[{$item->document_count}]</em>--></a></li> <li loop="$val->children=>$idx,$item" class="on_"|cond="$category==$item->category_srl"><a href="{getUrl('category',$item->category_srl,'document_srl','', 'page', '')}">{$item->title}<!--<em cond="$val->document_count">[{$item->document_count}]</em>--></a></li>
</ul> </ul>
</li> </li>
</ul> </ul>

2
modules/comment/comment.item.php
View file

@ -77,7 +77,7 @@ class commentItem extends BaseObject
$this->adds($attribute); $this->adds($attribute);
// define vars on the object for backward compatibility of skins // define vars on the object for backward compatibility of skins
if(count($attribute)) if(countobj($attribute))
{ {
foreach($attribute as $key => $val) foreach($attribute as $key => $val)
{ {

2
modules/editor/editor.model.php
View file

@ -527,7 +527,7 @@ class editorModel extends editor
$group_list = array(); $group_list = array();
} }
if(count($component_list)) if(countobj($component_list))
{ {
foreach($component_list as $key => $val) foreach($component_list as $key => $val)
{ {