Permalink
Browse files

Merge branch 'master' of github.com:joomla/joomla-platform into tests

  • Loading branch information...
2 parents b82c134 + a814a03 commit 4937f773723edc1f7c7b9fcadbe21c2c29123805 @eddieajau committed Aug 12, 2011
@@ -205,7 +205,8 @@ protected function getInput()
{
// Remove layout files that exist in the component folder or that have XML files
if ((in_array(JFile::stripext(JFile::getName($file)), $component_layouts))
- || (in_array(JFile::stripext(JFile::getName($file)), $xml_files)))
+ || (in_array(JFile::stripext(JFile::getName($file)), $xml_files))
+ )
{
unset($files[$i]);
}
@@ -278,10 +278,14 @@ protected function getInput()
}
$html[] = '</div></div>';
- $js = "window.addEvent('domready', function(){ new Fx.Accordion($$('div#permissions-sliders.pane-sliders .panel h3.pane-toggler'), $$('div#permissions-sliders.pane-sliders .panel div.pane-slider'), {onActive: function(toggler, i) {toggler.addClass('pane-toggler-down');toggler.removeClass('pane-toggler');i.addClass('pane-down');i.removeClass('pane-hide');Cookie.write('jpanesliders_permissions-sliders"
+ $js = "window.addEvent('domready', function(){ new Fx.Accordion($$('div#permissions-sliders.pane-sliders .panel h3.pane-toggler'),"
+ . "$$('div#permissions-sliders.pane-sliders .panel div.pane-slider'), {onActive: function(toggler, i) {toggler.addClass('pane-toggler-down');"
+ . "toggler.removeClass('pane-toggler');i.addClass('pane-down');i.removeClass('pane-hide');Cookie.write('jpanesliders_permissions-sliders"
. $component
- . "',$$('div#permissions-sliders.pane-sliders .panel h3').indexOf(toggler));},onBackground: function(toggler, i) {toggler.addClass('pane-toggler');toggler.removeClass('pane-toggler-down');i.addClass('pane-hide');i.removeClass('pane-down');},duration: 300,display: "
- . JRequest::getInt('jpanesliders_permissions-sliders' . $component, 0, 'cookie') . ",show: "
+ . "',$$('div#permissions-sliders.pane-sliders .panel h3').indexOf(toggler));},"
+ . "onBackground: function(toggler, i) {toggler.addClass('pane-toggler');toggler.removeClass('pane-toggler-down');i.addClass('pane-hide');"
+ . "i.removeClass('pane-down');}, duration: 300, display: "
+ . JRequest::getInt('jpanesliders_permissions-sliders' . $component, 0, 'cookie') . ", show: "
. JRequest::getInt('jpanesliders_permissions-sliders' . $component, 0, 'cookie') . ", alwaysHide:true, opacity: false}); });";
JFactory::getDocument()->addScriptDeclaration($js);
@@ -171,7 +171,9 @@ protected static function loadClass($entity, $type)
{
$class = 'JForm' . ucfirst($entity) . ucfirst($type);
if (class_exists($class))
+ {
return $class;
+ }
// Get the field search path array.
$paths = JFormHelper::addPath($entity);
@@ -199,7 +201,7 @@ protected static function loadClass($entity, $type)
// Try to find the class file.
if ($file = JPath::find($paths, strtolower($type) . '.php'))
{
- require_once $file;
+ include_once $file;
}
// Check for all if the class exists.
@@ -75,8 +75,9 @@ public function test(&$element, $value, $group = null, &$input = null, &$form =
}
// For some schemes here must be two slashes.
if (($urlScheme == 'http' || $urlScheme == 'https' || $urlScheme == 'ftp' || $urlScheme == 'sftp' || $urlScheme == 'gopher'
- || $urlScheme == 'wais' || $urlScheme == 'gopher' || $urlScheme == 'prospero' || $urlScheme == 'telnet')
- && ((substr($value, strlen($urlScheme), 3)) !== '://'))
+ || $urlScheme == 'wais' || $urlScheme == 'gopher' || $urlScheme == 'prospero' || $urlScheme == 'telnet')
+ && ((substr($value, strlen($urlScheme), 3)) !== '://')
+ )
{
return false;
}

0 comments on commit 4937f77

Please sign in to comment.