diff options
| author | patdenice <patdenice@piwigo.org> | 2011-04-12 11:41:57 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2011-04-12 11:41:57 +0000 |
| commit | 5a3fc07ba42570432887f1ab66f1f12fdab4999e (patch) | |
| tree | 151c72156249f93e583aef3eb7fda256d1ac3dab /plugins/LocalFilesEditor/admin.php | |
| parent | cf4e2c81f948a1a9e54258d3ced978d1ad2ef234 (diff) | |
merge r10309 from trunk to branch 2.2
Always load codemirror
git-svn-id: http://piwigo.org/svn/branches/2.2@10311 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'plugins/LocalFilesEditor/admin.php')
| -rw-r--r-- | plugins/LocalFilesEditor/admin.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/LocalFilesEditor/admin.php b/plugins/LocalFilesEditor/admin.php index a9205cfac..cd2c5b301 100644 --- a/plugins/LocalFilesEditor/admin.php +++ b/plugins/LocalFilesEditor/admin.php @@ -360,7 +360,6 @@ if (!empty($edited_file)) $template->assign(array( 'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=plugin-LocalFilesEditor-'.$page['tab'], 'LOCALEDIT_PATH' => LOCALEDIT_PATH, - 'LOAD_CODEMIRROR' => isset($conf['LocalFilesEditor']) ? $conf['LocalFilesEditor'] : 'off', 'CODEMIRROR_MODE' => @$codemirror_mode ) ); |