framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check sidebar conditional tag exists

Browse Source 
Return false for non-existent conditional tags. Fixes #993
This commit is contained in:
Nicholas Fox
2014-07-28 13:44:40 +01:00
parent cf91138317
commit f213cc02e6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/sidebar.php
View File

@@ -30,10 +30,13 @@ class Roots_Sidebar {
} }
private function check_conditional_tag($conditional_tag) { private function check_conditional_tag($conditional_tag) {
if (is_array($conditional_tag)) { $conditional_arg = is_array($conditional_tag) ? $conditional_tag[1] : false;
return $conditional_tag[0]($conditional_tag[1]); $conditional_tag = $conditional_arg ? $conditional_tag[0] : $conditional_tag;
if (function_exists($conditional_tag)) {
return $conditional_arg ? $conditional_tag($conditional_arg) : $conditional_tag();
} else { } else {
return $conditional_tag(); return false;
} }
} }