Skip to content

Commit a38b871

Browse files
author
Phil Sturgeon
committed
Removed commented out code
I'm sure that was commented out for a reason but that should definitely be in there.
1 parent f9520b2 commit a38b871

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

application/libraries/REST_Controller.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ abstract class REST_Controller extends CI_Controller
6565
*
6666
* @var object
6767
*/
68-
protected $client = NULL;
68+
protected $client = NULL;
6969

7070
/**
7171
* The arguments for the GET request method
@@ -265,7 +265,7 @@ public function _remap($object_called, $arguments)
265265
// Should we answer if not over SSL?
266266
if (config_item('force_https') AND !$this->_detect_ssl())
267267
{
268-
$this->response(array('status' => false, 'error' => 'Unsupported protocol'), 403);
268+
$this->response(array('status' => false, 'error' => 'Unsupported protocol'), 403);
269269
}
270270

271271
$pattern = '/^(.*)\.('.implode('|', array_keys($this->_supported_formats)).')$/';
@@ -280,7 +280,7 @@ public function _remap($object_called, $arguments)
280280
$log_method = !(isset($this->methods[$controller_method]['log']) AND $this->methods[$controller_method]['log'] == FALSE);
281281

282282
// Use keys for this method?
283-
$use_key = !(isset($this->methods[$controller_method]['key']) AND $this->methods[$controller_method]['key'] == FALSE);
283+
$use_key = ! (isset($this->methods[$controller_method]['key']) AND $this->methods[$controller_method]['key'] == FALSE);
284284

285285
// Get that useless shitty key out of here
286286
if (config_item('rest_enable_keys') AND $use_key AND $this->_allow === FALSE)
@@ -605,11 +605,9 @@ protected function _detect_api_key()
605605

606606
$this->rest->key = $this->client->{config_item('rest_key_column')};
607607

608-
/*
609608
isset($row->user_id) AND $this->rest->user_id = $row->user_id;
610609
isset($row->level) AND $this->rest->level = $row->level;
611610
isset($row->ignore_limits) AND $this->rest->ignore_limits = $row->ignore_limits;
612-
*/
613611

614612
return $this->client;
615613
}

0 commit comments

Comments
 (0)