Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'origin/JMedia' into JMedia

  • Loading branch information...
commit 3186af6c7a50e9a96f02eed5a8f456bd02d1fc25 2 parents 807a97b + 735400b
@kaviththiranga authored
View
6 libraries/joomla/media/combiner.php
@@ -145,9 +145,6 @@ public static function getCombiners()
// Derive the class name from the type.
$class = str_ireplace('.php', '', trim($type));
- // Load the class
- jimport('joomla.media.combiner.' . $class);
-
// If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
if (!class_exists('JMediaCombiner' . ucfirst($class)))
{
@@ -195,9 +192,6 @@ public static function getInstance( $options = array())
// Derive the class name from the type.
$class = 'JMediaCombiner' . ucfirst(strtolower($options['type']));
- // Load the class
- jimport('joomla.media.combiner.' . $class);
-
// If the class still doesn't exist we have nothing left to do but throw an exception. We did our best.
if (!class_exists($class))
{
View
6 libraries/joomla/media/combiner/css.php
@@ -46,7 +46,7 @@ public function combine()
{
if ($this->_options['FILE_COMMENTS'])
{
- $this->_combined .= '/* File : ' . JFile::getName($file) . ' : Start */' . "\n\n";
+ $this->_combined .= '/** File : ' . JFile::getName($file) . ' : Start **/' . "\n\n";
}
if ($this->_options['COMPRESS'])
@@ -62,11 +62,11 @@ public function combine()
if ($this->_options['FILE_COMMENTS'])
{
- $this->_combined .= '/* File : ' . JFile::getName($file) . ' : End */' . "\n\n";
+ $this->_combined .= '/** File : ' . JFile::getName($file) . ' : End **/' . "\n\n";
}
}
- $this->_combined .= '/* ' . $this->sourceCount . ' css files are combined */';
+ $this->_combined .= '/** ' . $this->sourceCount . ' css files are combined **/';
}
}
View
6 libraries/joomla/media/combiner/js.php
@@ -41,7 +41,7 @@ public function combine()
{
if($this->_options['FILE_COMMENTS'])
{
- $this->_combined .= '// File : ' . JFile::getName($file) . ' : Start' . "\n\n";
+ $this->_combined .= '/** File : ' . JFile::getName($file) . ' : Start **/' . "\n\n";
}
if ($this->_options['COMPRESS'])
@@ -57,10 +57,10 @@ public function combine()
if($this->_options['FILE_COMMENTS'])
{
- $this->_combined .= '// File : ' . JFile::getName($file) . ' : End' . "\n\n";
+ $this->_combined .= '/** File : ' . JFile::getName($file) . ' : End **/' . "\n\n";
}
}
- $this->_combined .= '// ' . $this->sourceCount . ' js files are combined';
+ $this->_combined .= '/** ' . $this->sourceCount . ' js files are combined **/';
}
}
View
6 libraries/joomla/media/compressor.php
@@ -175,9 +175,6 @@ public static function getCompressors()
// Derive the class name from the type.
$class = str_ireplace('.php', '', trim($type));
- // Load the class
- jimport('joomla.media.compressor.' . $class);
-
// If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
if (!class_exists('JMediaCompressor' . ucfirst($class)))
{
@@ -327,9 +324,6 @@ public static function getInstance($options = array())
// Derive the class name from the type.
$class = 'JMediaCompressor' . ucfirst(strtolower($options['type']));
- // Load the class
- jimport('joomla.media.compressor.' . $class);
-
// If the class still doesn't exist we have nothing left to do but throw an exception. We did our best.
if (!class_exists($class))
{
View
22 libraries/joomla/media/exception.php
@@ -1,22 +0,0 @@
-<?php
-/**
- * @package Joomla.Platform
- * @subpackage Media
- * @since 12.1
- */
-
-//igonre
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Compressor Exception Class.
- *
- * @package Joomla.Platform
- * @subpackage Media
- * @since 12.1
- */
-class JMediaException extends Exception
-{
-
-}

0 comments on commit 3186af6

Please sign in to comment.
Something went wrong with that request. Please try again.