Merge pull request silverstripe#1980 from feejin/bugfix-ignore-underscored-themes

halkyon · halkyon · commit 916de302045d · 2013-05-23T15:10:00.000-07:00
FIX: exclude directory from available themes when underscore is first character
diff --git a/view/SSViewer.php b/view/SSViewer.php
@@ -644,7 +644,7 @@ public static function get_themes($path = null, $subthemes = false) {
 
 		foreach (scandir($path) as $item) {
 			if ($item[0] != '.' && is_dir("$path/$item")) {
-				if ($subthemes || !strpos($item, '_')) {
+				if ($subthemes || strpos($item, '_') === false) {
 					$themes[$item] = $item;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ public static function get_themes($path = null, $subthemes = false) {`
`644`	`644`
`645`	`645`	`foreach (scandir($path) as $item) {`
`646`	`646`	`if ($item[0] != '.' && is_dir("$path/$item")) {`
`647`		`- if ($subthemes \|\| !strpos($item, '_')) {`
	`647`	`+ if ($subthemes \|\| strpos($item, '_') === false) {`
`648`	`648`	`$themes[$item] = $item;`
`649`	`649`	`}`
`650`	`650`	`}`