PsychoticNinja/Stikked
1
0
Fork 0
mirror of https://github.com/claudehohl/Stikked.git synced 2025-04-25 12:31:06 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:claudehohl/Stikked

Browse Source
This commit is contained in:
Claude 2014-09-30 18:13:54 +02:00
commit 50dc9ab1dd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/application/config/geshi_languages.php
View File

@ -9,6 +9,7 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
//geshi languages
$config['geshi_languages'] = array(
'text' => 'Plain Text',
'html5' => 'HTML5',
'css' => 'CSS',
'javascript' => 'JavaScript',
@ -25,7 +26,7 @@ $config['geshi_languages'] = array(
'latex' => 'LaTeX',
'sql' => 'SQL',
'xml' => 'XML',
'text' => 'Plain Text',
'' => '', // separator
'4cs' => '4CS',
'6502acme' => 'MOS 6502',
'6502kickass' => 'MOS 6502 Kick Assembler',

8
htdocs/application/models/languages.php
View File

@ -30,12 +30,14 @@ class Languages extends CI_Model
$data = array();
foreach ($this->geshi_languages as $key => $value)
{
$data[$key] = $value;
if ($key == 'text')
if ($key == '')
{
$data["0"] = "-----------------";
}
else
{
$data[$key] = $value;
}
}
return $data;
}