From e0dfaee5b598f5e617581de158fb9abb0bfdfe80 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Fri, 19 Mar 2010 22:30:03 +0100 Subject: remove useless config option Signed-off-by: Florian Pritz --- system/application/config/example/config.php | 1 - system/application/models/file_mod.php | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'system') diff --git a/system/application/config/example/config.php b/system/application/config/example/config.php index 487740d12..b9ce20468 100755 --- a/system/application/config/example/config.php +++ b/system/application/config/example/config.php @@ -341,7 +341,6 @@ $config['upload_path'] = FCPATH.'data/uploads'; $config['upload_max_size'] = 256*1024*1024; $config['upload_max_text_size'] = 2*1024*1024; $config['upload_max_age'] = 60*60*24*5; // 5 days -$config['paste_download_url'] = 'file/download/'; // "" with url rewrite $config['passwordsalt'] = ''; // just enter any string you want here /* End of file config.php */ diff --git a/system/application/models/file_mod.php b/system/application/models/file_mod.php index 626ae431c..69494259b 100644 --- a/system/application/models/file_mod.php +++ b/system/application/models/file_mod.php @@ -97,9 +97,9 @@ class File_mod extends Model { $data = array(); if ($mode) { - $data['url'] = site_url($this->config->item('paste_download_url').$id.'/'.$mode); + $data['url'] = site_url().$id.'/'.$mode; } else { - $data['url'] = site_url($this->config->item('paste_download_url').$id).'/'; + $data['url'] = site_url().$id.'/'; } if (strstr($_SERVER['HTTP_USER_AGENT'], 'libcurl')) { @@ -168,7 +168,7 @@ class File_mod extends Model { && filesize($file) <= $this->config->item('upload_max_text_size') ) { $data['title'] = $filedata['filename']; - $data['raw_link'] = site_url($this->config->item('paste_download_url').$id); + $data['raw_link'] = site_url().$id; header("Content-Type: text/html\n"); echo $this->load->view('file/html_header', $data, true); // only rewrite if it's fast -- cgit v1.2.3-24-g4f1b