merge r10348 from trunk to branch 2.2

Clean code

git-svn-id: http://piwigo.org/svn/branches/2.2@10349 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-04-13 10:38:45 +00:00
parent acd200d647
commit 7211eee1ca
11 changed files with 340 additions and 264 deletions
+2 -4
View File
@@ -24,7 +24,7 @@
define('PHPWG_ROOT_PATH', '../../');
define('IN_ADMIN', true);
include_once(PHPWG_ROOT_PATH . 'include/common.inc.php');
include_once(LOCALEDIT_PATH.'functions.inc.php');
include_once(LOCALEDIT_PATH.'include/functions.inc.php');
load_language('plugin.lang', LOCALEDIT_PATH);
check_status(ACCESS_ADMINISTRATOR);
@@ -36,7 +36,7 @@ if (isset($_GET['file']))
die('Hacking attempt!');
}
$template->set_filename('show_default', dirname(__FILE__) . '/show_default.tpl');
$template->set_filename('show_default', dirname(__FILE__) . '/template/show_default.tpl');
$file = file_get_contents(PHPWG_ROOT_PATH . $path);
$title = str_replace('/', ' / ', $path);
@@ -44,8 +44,6 @@ if (isset($_GET['file']))
$template->assign(array(
'TITLE' => $title,
'DEFAULT_CONTENT' => $file,
'LOCALEDIT_PATH' => LOCALEDIT_PATH,
'CODEMIRROR_MODE' => 'application/x-httpd-php'
)
);