Commit d9cf4360 authored by Karamel's avatar Karamel
Browse files

Merge branch '4.0' into 5.0. Completes the previous security fix.

It was not reported by me.

Conflicts:
	dbimg.php
parents a98ef01d 5a40b004
......@@ -124,10 +124,5 @@ case 'barcode':
case 'custcard':
generate_barcode("code128", $_GET['code']);
break;
case 'js':
$file = $_GET['id'];
$file = str_replace("..", "", $file);
require_once(PT::$ABSPATH . "/templates/" . $config['template'] . "/" . $file);
break;
}
?>
......@@ -33,7 +33,9 @@ function tpl_open() {
<link rel="stylesheet" type="text/css" href="<?php echo get_template_url(); ?>/js/pepper-grinder/jquery-ui-1.10.4.custom.css" />
<script type="text/javascript" src="<?php echo get_template_url(); ?>/js/jquery-1.9.1.min.js"></script>
<script type="text/javascript" src="<?php echo get_template_url(); ?>/js/jquery-ui-1.10.4.custom.min.js"></script>
<script type="text/javascript" src="?<?php echo \Pasteque\PT::URL_ACTION_PARAM; ?>=img&w=js&id=js/pasteque.js.php"></script>
<script type="text/javascript">
<?php require_once(dirname(__FILE__) . '/js/pasteque.js.php'); ?>
</script>
</head>
<body>
<?php tpl_menu(); ?>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment