Skip to content

Commit 37cba2d

Browse files
committed
Removed FCPPATH as it is no longer used. Fixed misspelling of environment. Fixed language loading.
1 parent 787e71f commit 37cba2d

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

application/hooks/Unmark_Languages.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ public function loadLanguage()
2222
{
2323
$language_to_load = $this->CI->config->item('language');
2424
$language_to_load = ( !isset($language_to_load) || empty($language_to_load) ) ? 'english' : $language_to_load;
25-
$language_file_to_load = FCPATH . APPPATH . 'language/' . $language_to_load . '.php';
25+
$language_file_to_load = APPPATH . 'language/' . $language_to_load . '.php';
2626

2727
if ( file_exists($language_file_to_load) ) :
28-
include( FCPATH . APPPATH . 'language/' . $language_to_load . '.php' );
28+
include( APPPATH . 'language/' . $language_to_load . '.php' );
2929
$this->CI->config->set_item( 'phrases', $unmark_language ); // Load phrases into global config
3030
log_message('DEBUG', 'The "' . $language_to_load . '" language file has been loaded.');
3131
else :
32-
log_message('ERROR', 'The "' . $language_to_load . '" language file could be found.');
32+
log_message('ERROR', 'The "' . $language_to_load . '" language file could not be found.');
3333
endif;
3434

3535
}
@@ -49,6 +49,9 @@ function unmark_phrase( $phrase, $phrase_plural='', $number=1 )
4949
// Load phrases from config
5050
$phrases = $CI->config->item('phrases');
5151

52+
//print_r($phrases);
53+
//exit;
54+
5255
if ( !is_array($phrases) ) :
5356
return $phrase;
5457
endif;

application/libraries/Exceptional.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function sendToTracker($message, $type, $backtrace, $custom_data=array(),
110110
'type' => $type,
111111
'backtrace' => $backtrace,
112112
'custom_data' => $custom_data,
113-
'enviornment' => $env,
113+
'environment' => $env,
114114
'user' => $user
115115
);
116116

application/views/marks/index.php

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
switch ($lookup_type) {
4242
case 'label':
4343
$heading['icon'] = 'icon-circle';
44+
//print_r($total);exit;
4445
$heading['title'] = sprintf(unmark_phrase('mark labeled %s', 'marks labeled %s', $total), unmark_phrase($label_name));
4546
break;
4647
case 'archive':

index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
define('BASEPATH', $system_path);
217217

218218
// Path to the front controller (this file)
219-
define('FCPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
219+
// Removed when upgrading to CI 3.x define('FCPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
220220

221221
// Name of the "system folder"
222222
define('SYSDIR', basename(BASEPATH));

0 commit comments

Comments
 (0)