Skip to content

Commit

Permalink
Merge pull request #4 from redCOMPONENT-COM/fixCallHelpersInAdminSide
Browse files Browse the repository at this point in the history
Fix call extends helpers in admin side
  • Loading branch information
Kixo committed Apr 2, 2015
2 parents d2338f3 + 41c54ee commit 4a821fa
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# OSX
.DS_Store
._*
.Spotlight-V100
.Trashes

# Windows
Thumbs.db
Desktop.ini

# PHPStorm
.idea/

# Eclipse
.buildpath
.project
.settings

# Temp files
*.tmp
*.bak
*.swp
*~.nib
*~

# Ignore mergetool files
*.orig

# Phing build script
build.properties
phing-latest.phar

# Never ignore
!.gitignore
!index.html
!index.php
2 changes: 1 addition & 1 deletion mvcoverride.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ private function getOverrideFileInfo($includePath, $component, $filePath, $type
$baseName = basename($filePath);
$prefix = substr($baseName, 0, 5);

if (($app->isAdmin() && $prefix == 'admin') || (!$app->isAdmin() && $prefix != 'admin') )
if (($app->isAdmin() && $prefix == 'admin') || (!$app->isAdmin() && $prefix != 'admin') || !(!$app->isAdmin() && $prefix == 'admin'))
{
$realPath = JPATH_SITE . '/components' . substr($filePath, strlen($includePath));
}
Expand Down

0 comments on commit 4a821fa

Please sign in to comment.