harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge hell

Browse Source
This commit is contained in:
redmatrix
2015-12-20 14:55:43 -08:00
parent 61fa97baab
commit f23e8f8d41
4 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/comanche.php
View File

@@ -287,8 +287,7 @@ function comanche_widget($name, $text) {
if(! function_exists($func)) {
if(file_exists('widget/' . trim($name) . '.php'))
require_once('widget/' . trim($name) . '.php');
elseif(folder_exists('widget/'. trim($name))
&& (file_exists('widget/' . trim($name) . '/' . trim($name) . '.php')))
elseif(file_exists('widget/' . trim($name) . '/' . trim($name) . '.php'))
require_once('widget/' . trim($name) . '/' . trim($name) . '.php');
}
else {