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
2026-08-08 01:32:59 +02:00 · 2011-04-12 11:41:57 +00:00
parent cf4e2c81f9
commit 5a3fc07ba4
31 changed files with 12 additions and 192 deletions
@@ -45,7 +45,6 @@ if (isset($_GET['file']))
    'TITLE' => $title,
    'DEFAULT_CONTENT' => $file,
    'LOCALEDIT_PATH' => LOCALEDIT_PATH,
-    'LOAD_CODEMIRROR' => isset($conf['LocalFilesEditor']) ? $conf['LocalFilesEditor'] : 'on',
    'CODEMIRROR_MODE' => 'application/x-httpd-php'
    )
  );