diff --git a/about.md b/about.md index 53dc203a..5b5f0902 100644 --- a/about.md +++ b/about.md @@ -2,6 +2,9 @@ This is a brand new release of Tendoo CMS, with auto update feature. ### What's new ? +- Oauth Feature Phase 1 +- Migration fixed +- Merging CodeIgniter RestFul ### Bug Fix diff --git a/application/config/config.php b/application/config/config.php index 6b2aed7d..f9ef0272 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -414,7 +414,7 @@ | for backwards compatibility purposes! | */ -$config['global_xss_filtering'] = true; +$config['global_xss_filtering'] = false; /* |-------------------------------------------------------------------------- diff --git a/application/config/tendoo.php b/application/config/tendoo.php index 4b7404ae..7478c4e0 100644 --- a/application/config/tendoo.php +++ b/application/config/tendoo.php @@ -19,7 +19,7 @@ $config[ 'default_logout_route' ] = '/dashboard/'; // Core ID -$config[ 'version' ] = $config[ 'core_version' ] = '3.1.1'; // core id +$config[ 'version' ] = $config[ 'core_version' ] = '3.1.2'; // core id $config[ 'core_signature' ] = 'Tendoo ' . $config[ 'version' ]; // core id $config[ 'supported_languages' ] = array( 'en_US' => 'English', @@ -27,7 +27,7 @@ // 'es_ES' => 'EspaƱol' // Coming Soon ); $config[ 'site_language' ] = 'en_US'; // @since 4.0.5 -$config[ 'database_version' ] = '1.0'; +$config[ 'database_version' ] = '1.1'; // Text Domain @since 3.0.5 $config[ 'text_domain' ] = array( diff --git a/application/libraries/Menu.php b/application/libraries/Menu.php index ddb56176..9815f24b 100644 --- a/application/libraries/Menu.php +++ b/application/libraries/Menu.php @@ -34,7 +34,7 @@ public static function load() $class = is_array($current_menu) && count($current_menu) > 1 ? 'treeview' : ''; $loop_index = 0; ?> -
  • "> db + ->where('key', @$_SERVER[ 'HTTP_' . get_instance()->config->item('rest_header_key') ]) + ->get('restapi_keys') + ->result(); + + return $query[0]->user; + } }