Skip to content

Commit

Permalink
Merge branch 'release/1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
David McReynolds committed Jun 11, 2014
2 parents 8d6ed8f + 85c7b1b commit 470fdf6
Show file tree
Hide file tree
Showing 239 changed files with 770 additions and 755 deletions.
2 changes: 2 additions & 0 deletions fuel/application/config/MY_fuel_layouts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

$config['layouts_folder'] = '_layouts';

$config['hidden'] = array();

$config['layouts']['main'] = array(
//'file' => $config['layouts_path'].'main',
// 'class' => 'Main_layout',
Expand Down
4 changes: 2 additions & 2 deletions fuel/application/views/_blocks/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
<div class="page">
<div class="wrapper">
<header class="page_header">
<div class="logo"><object type="image/svg+xml" width="160" height="145" data="<?= img_path('_template_icons.svg#fuel') ?>"></object></div>
<h1><?=fuel_var('heading')?></h1>
<div class="logo"><object type="image/svg+xml" width="160" height="145" data="<?php echo img_path('_template_icons.svg#fuel') ?>"></object></div>
<h1><?php echo fuel_var('heading')?></h1>
</header>
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Benchmark.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
4 changes: 2 additions & 2 deletions fuel/codeigniter/core/CodeIgniter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand All @@ -33,7 +33,7 @@
* @var string
*
*/
define('CI_VERSION', '2.1.4');
define('CI_VERSION', '2.2.0');

/**
* CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Common.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
4 changes: 2 additions & 2 deletions fuel/codeigniter/core/Controller.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down Expand Up @@ -37,7 +37,7 @@ class CI_Controller {
public function __construct()
{
self::$instance =& $this;

// Assign all the class objects that were instantiated by the
// bootstrap file (CodeIgniter.php) to local class variables
// so that CI can run as one big super object.
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Exceptions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Hooks.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Input.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Loader.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Model.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Output.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Router.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Security.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/URI.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/core/Utf8.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 2.0
Expand Down
Empty file modified fuel/codeigniter/core/index.html
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/DB.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/DB_active_rec.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/DB_cache.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/DB_driver.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/DB_forge.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/DB_result.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
4 changes: 2 additions & 2 deletions fuel/codeigniter/database/DB_utility.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* Code Igniter
* CodeIgniter
*
* An open source application development framework for PHP 5.1.6 or newer
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/cubrid/cubrid_driver.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author Esen Sagynov
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 2.0.2
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/cubrid/cubrid_forge.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author Esen Sagynov
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/cubrid/cubrid_result.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author Esen Sagynov
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 2.0.2
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/cubrid/cubrid_utility.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author Esen Sagynov
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
Empty file modified fuel/codeigniter/database/drivers/cubrid/index.html
100644 → 100755
View file
Empty file.
Empty file modified fuel/codeigniter/database/drivers/index.html
100644 → 100755
View file
Empty file.
Empty file modified fuel/codeigniter/database/drivers/mssql/index.html
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mssql/mssql_driver.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mssql/mssql_forge.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mssql/mssql_result.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mssql/mssql_utility.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
Empty file modified fuel/codeigniter/database/drivers/mysql/index.html
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mysql/mysql_driver.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mysql/mysql_forge.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mysql/mysql_result.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mysql/mysql_utility.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
Empty file modified fuel/codeigniter/database/drivers/mysqli/index.html
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mysqli/mysqli_driver.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mysqli/mysqli_forge.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mysqli/mysqli_result.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
2 changes: 1 addition & 1 deletion fuel/codeigniter/database/drivers/mysqli/mysqli_utility.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
Expand Down
Empty file modified fuel/codeigniter/database/drivers/oci8/index.html
100644 → 100755
View file
Empty file.
Loading

0 comments on commit 470fdf6

Please sign in to comment.