Skip to content
This repository was archived by the owner on Oct 30, 2021. It is now read-only.

Commit a281fb2

Browse files
betweenbrainbetweenbrain
committed
Merge pull request #22 from construct-framework/develop
Merge develop for 3.0.5
2 parents 1e293b7 + 83b10dc commit a281fb2

25 files changed

+40
-41
lines changed

‎CREDITS.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @package Template Framework for Joomla!
44
* @author Matt Thomas http://construct-framework.com | http://betweenbrain.com
5-
* @copyright Copyright (C) 2009 - 2013 Matt Thomas. All rights reserved.
5+
* @copyright Copyright (C) 2009 - 2014 Matt Thomas. All rights reserved.
66
* @license GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
77
*/
88
?>

‎component.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @package Template Framework for Joomla!+
44
* @author Cristina Solana http://nightshiftcreative.com
55
* @author Matt Thomas http://construct-framework.com | http://betweenbrain.com
6-
* @copyright Copyright (C) 2009 - 2013 Matt Thomas. All rights reserved.
6+
* @copyright Copyright (C) 2009 - 2014 Matt Thomas. All rights reserved.
77
* @license GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
88
*/
99

‎css/bootstruct.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Website http://betweenbrain.com
88
* Email matt@betweenbrain.com
99
* Support https://github.com/betweenbrain/
10-
* Copyright Copyright (C) 2013 betweenbrain llc. All Rights Reserved.
10+
* Copyright Copyright (C) 2014 betweenbrain llc. All Rights Reserved.
1111
* License GNU GPL v3 or later
1212
*/
1313

‎elements/googlewebfont.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @package Template Framework for Joomla!
44
* @author Matt Thomas http://construct-framework.com | http://betweenbrain.com
5-
* @copyright Copyright (C) 2009 - 2013 Matt Thomas. All rights reserved.
5+
* @copyright Copyright (C) 2009 - 2014 Matt Thomas. All rights reserved.
66
* @license GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
77
*/
88

‎elements/helper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @package Template Framework for Joomla!+
44
* @author Cristina Solana http://nightshiftcreative.com
55
* @author Matt Thomas http://construct-framework.com | http://betweenbrain.com
6-
* @copyright Copyright (C) 2009 - 2013 Matt Thomas. All rights reserved.
6+
* @copyright Copyright (C) 2009 - 2014 Matt Thomas. All rights reserved.
77
* @license GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
88
*/
99
defined('_JEXEC') or die;

‎elements/logic.php‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @package Template Framework for Joomla!+
44
* @author Cristina Solana http://nightshiftcreative.com
55
* @author Matt Thomas http://construct-framework.com | http://betweenbrain.com
6-
* @copyright Copyright (C) 2009 - 2013 Matt Thomas. All rights reserved.
6+
* @copyright Copyright (C) 2009 - 2014 Matt Thomas. All rights reserved.
77
* @license GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
88
*/
99

@@ -224,12 +224,12 @@
224224

225225
#-------------------------------- Item ID ---------------------------------#
226226

227-
$itemId = $jinput->get('Itemid', 0);
227+
$itemId = $jinput->get('Itemid');
228228

229229
#------------------------------- Article ID -------------------------------#
230230

231231
if ($view == 'article') {
232-
$articleId = $jinput->get('id');
232+
$articleId = $jinput->get('id', '', 'INT');
233233
} else {
234234
($articleId = NULL);
235235
}
@@ -240,18 +240,17 @@ function getCategory($id) {
240240
$app = JFactory::getApplication();
241241
$database = JFactory::getDBO();
242242
$jinput = $app->input;
243-
if (($jinput->get('view', 0) == "category") || ($jinput->get('view', 0) == "categories")) {
243+
if (($jinput->get('view') == "category") || ($jinput->get('view') == "categories")) {
244244
return $id;
245-
} elseif ($jinput->get('view', 0) == "article") {
246-
$temp = explode(":", $id);
247-
$sql = "SELECT catid FROM #__content WHERE id = " . $temp[0];
245+
} elseif ($jinput->get('view') == "article") {
246+
$sql = "SELECT catid FROM #__content WHERE id = " . $id;
248247
$database->setQuery($sql);
249248

250249
return $database->loadResult();
251250
}
252251
}
253252

254-
$catId = getCategory($jinput->get('id'));
253+
$catId = getCategory($jinput->get('id', '', 'INT'));
255254

256255
#------------------------- Ancestor Category IDs --------------------------#
257256

@@ -404,22 +403,22 @@ function getAncestorCategories($id) {
404403
// Load core Bootstrap CSS and Bootstrap bugfixes using class loader method. See http://docs.joomla.org/JHtml::_/11.1
405404
JHtmlBootstrap::loadCss($includeMaincss = TRUE, $this->direction);
406405
// Load additonal Bootstruct core CSS
407-
$doc->addStyleSheet($template . '/css/bootstruct.css?' . $version, 'text/css', 'screen');
406+
$doc->addStyleSheet($template . '/css/bootstruct.css?' . $version);
408407
}
409408

410409
if ($gridSystem > -1) {
411-
$doc->addStyleSheet($template . '/css/grids/' . $gridSystem . '?' . $version, 'text/css', 'screen');
410+
$doc->addStyleSheet($template . '/css/grids/' . $gridSystem . '?' . $version);
412411
}
413412
if ($customStyleSheet > -1) {
414-
$doc->addStyleSheet($template . '/css/' . $customStyleSheet . '?' . $customStyleSheetVersion, 'text/css', 'screen');
413+
$doc->addStyleSheet($template . '/css/' . $customStyleSheet . '?' . $customStyleSheetVersion);
415414
}
416415
if ($this->direction == 'rtl') {
417-
$doc->addStyleSheet($template . '/css/rtl.css?' . $version, 'text/css', 'screen');
416+
$doc->addStyleSheet($template . '/css/rtl.css?' . $version);
418417
}
419418
// Override style sheet returned from our template helper
420419
$cssFile = $styleOverride->getIncludeFile();
421420
if ($cssFile) {
422-
$doc->addStyleSheet($cssFile . '?' . $version, 'text/css', 'screen');
421+
$doc->addStyleSheet($cssFile . '?' . $version);
423422
}
424423

425424
// Typography

‎error.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @package Template Framework for Joomla!+
44
* @author Cristina Solana http://nightshiftcreative.com
55
* @author Matt Thomas http://construct-framework.com | http://betweenbrain.com
6-
* @copyright Copyright (C) 2009 - 2013 Matt Thomas. All rights reserved.
6+
* @copyright Copyright (C) 2009 - 2014 Matt Thomas. All rights reserved.
77
* @license GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
88
*/
99

‎html/mod_menu/Dropdown.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @package Joomla.Site
44
* @subpackage mod_menu
55
*
6-
* @copyright Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
6+
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
77
* @license GNU General Public License version 2 or later; see LICENSE.txt
88
*/
99

‎html/mod_menu/Dropdown_component.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @package Joomla.Site
44
* @subpackage mod_menu
55
*
6-
* @copyright Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
6+
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
77
* @license GNU General Public License version 2 or later; see LICENSE.txt
88
*/
99

‎html/mod_menu/Dropdown_heading.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @package Joomla.Site
44
* @subpackage mod_menu
55
*
6-
* @copyright Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
6+
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
77
* @license GNU General Public License version 2 or later; see LICENSE.txt
88
*/
99

0 commit comments

Comments
 (0)