aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/LocalFilesEditor/show_default.php
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-04-12 11:40:06 +0000
committerpatdenice <patdenice@piwigo.org>2011-04-12 11:40:06 +0000
commitcf4e2c81f948a1a9e54258d3ced978d1ad2ef234 (patch)
treef3fbaa43b7207e1f153a079ffb9c84dcf85c6c00 /plugins/LocalFilesEditor/show_default.php
parent28b9e115ee113b9510db949093c39a7743d8906f (diff)
merge r10307 from trunk to branch 2.2
feature:2262 Replace editarea by Codemirror: http://codemirror.net git-svn-id: http://piwigo.org/svn/branches/2.2@10310 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'plugins/LocalFilesEditor/show_default.php')
-rw-r--r--plugins/LocalFilesEditor/show_default.php14
1 files changed, 4 insertions, 10 deletions
diff --git a/plugins/LocalFilesEditor/show_default.php b/plugins/LocalFilesEditor/show_default.php
index 4a8e68289..9dc325643 100644
--- a/plugins/LocalFilesEditor/show_default.php
+++ b/plugins/LocalFilesEditor/show_default.php
@@ -38,14 +38,6 @@ if (isset($_GET['file']))
$template->set_filename('show_default', dirname(__FILE__) . '/show_default.tpl');
- // Editarea
- $editarea_options = array(
- 'syntax' => 'php',
- 'start_highlight' => true,
- 'allow_toggle' => false,
- 'is_editable' => false,
- 'language' => substr($user['language'], 0, 2));
-
$file = file_get_contents(PHPWG_ROOT_PATH . $path);
$title = str_replace('/', ' / ', $path);
@@ -53,8 +45,10 @@ if (isset($_GET['file']))
'TITLE' => $title,
'DEFAULT_CONTENT' => $file,
'LOCALEDIT_PATH' => LOCALEDIT_PATH,
- 'LOAD_EDITAREA' => isset($conf['LocalFilesEditor']) ? $conf['LocalFilesEditor'] : 'on',
- 'EDITAREA_OPTIONS' => $editarea_options));
+ 'LOAD_CODEMIRROR' => isset($conf['LocalFilesEditor']) ? $conf['LocalFilesEditor'] : 'on',
+ 'CODEMIRROR_MODE' => 'application/x-httpd-php'
+ )
+ );
$page['body_id'] = 'thePopuphelpPage';