QA, adjusted ignore path

Clansuite · Sep 3, 2012 · b2a7a15 · b2a7a15
1 parent 04726d1
commit b2a7a15
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,10 +6,8 @@
 # git config --global core.excludesfile ~/.gitignore
 
 # Clansuite
-/Application/Configuration/clansuite.php
-
-# Gravatar
-/Application/Uploads/images/gravatars
+/Clansuite/Configuration/clansuite.php
+/Clansuite/Uploads/images/gravatars
 
 # Mac OS X Finder and whatnot
 .DS_Store

diff --git a/Clansuite/Modules/Index/Controller/IndexController.php b/Clansuite/Modules/Index/Controller/IndexController.php
@@ -92,7 +92,8 @@ public function action_list()
         // Applying a Layout Template
         #$view = $this->getView()->setLayoutTemplate('admin/index.tpl');
 
-        echo 'Hello World!';
+        // direct output example
+        //echo 'Hello World!';
 
         $this->display();
     }

diff --git a/Clansuite/Modules/Thememanager/Controller/ThememanagerAdminController.php b/Clansuite/Modules/Thememanager/Controller/ThememanagerAdminController.php
@@ -142,7 +142,6 @@ public function getThemes($themes_directory)
                     $theme_info[$i]['preview_thumbnail'] = WWW_ROOT_THEMES . 'core/images/nopreview.jpg';
                 }
             }
-        }
 
         // sort and return
         asort($theme_info);

diff --git a/framework/Koch/Exception/Errorhandler.php b/framework/Koch/Exception/Errorhandler.php
@@ -374,12 +374,12 @@ public static function getErrorContext($file, $line, $scope)
 
                 // get ALL LINES syntax highlighted source-code of the file and explode it into an array
                 // the if check is needed to workaround "highlight_file() has been disabled for security reasons"
-                if(function_exists('highlight_file') === true) { 
+                if (function_exists('highlight_file') === true) {
                    $array_content = explode('<br />', highlight_file($file, true));
                 } else {
                    $array_content = explode('<br />', $file);
                 }
-                
+
                 // get the ERROR SURROUNDING LINES from ALL LINES
                 $array_content_sliced = array_slice($array_content, $errorcontext_starting_line-1, $scope, true);