KingOfDog.de/old
Archived
1
0
Fork 0
Code Releases Activity

Update to CodeIgniter 3.19

Browse Source
This commit is contained in:
Marcel
2018-12-29 16:16:49 +01:00
parent b036b4d36e
commit d09ee2788d
159 changed files with 2508 additions and 1910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
system/libraries/Migration.php
View File

@@ -6,7 +6,7 @@
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014 - 2016, British Columbia Institute of Technology
* Copyright (c) 2014 - 2018, British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
* @package CodeIgniter
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
* @copyright Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
@@ -211,7 +211,7 @@ class CI_Migration {
if ($target_version > 0 && ! isset($migrations[$target_version]))
{
$this->_error_string = sprintf(lang('migration_not_found'), $target_version);
$this->_error_string = sprintf($this->lang->line('migration_not_found'), $target_version);
return FALSE;
}
@@ -272,7 +272,7 @@ class CI_Migration {
{
if (isset($previous) && abs($number - $previous) > 1)
{
$this->_error_string = sprintf(lang('migration_sequence_gap'), $number);
$this->_error_string = sprintf($this->lang->line('migration_sequence_gap'), $number);
return FALSE;
}
@@ -285,15 +285,12 @@ class CI_Migration {
// Validate the migration file structure
if ( ! class_exists($class, FALSE))
{
$this->_error_string = sprintf(lang('migration_class_doesnt_exist'), $class);
$this->_error_string = sprintf($this->lang->line('migration_class_doesnt_exist'), $class);
return FALSE;
}
// method_exists() returns true for non-public methods,
// while is_callable() can't be used without instantiating.
// Only get_class_methods() satisfies both conditions.
elseif ( ! in_array($method, array_map('strtolower', get_class_methods($class))))
elseif ( ! is_callable(array($class, $method)))
{
$this->_error_string = sprintf(lang('migration_missing_'.$method.'_method'), $class);
$this->_error_string = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class);
return FALSE;
}
@@ -336,7 +333,7 @@ class CI_Migration {
if (empty($migrations))
{
$this->_error_string = lang('migration_none_found');
$this->_error_string = $this->lang->line('migration_none_found');
return FALSE;
}
@@ -395,7 +392,7 @@ class CI_Migration {
// There cannot be duplicate migration numbers
if (isset($migrations[$number]))
{
$this->_error_string = sprintf(lang('migration_multiple_version'), $number);
$this->_error_string = sprintf($this->lang->line('migration_multiple_version'), $number);
show_error($this->_error_string);
}