Merge remote-tracking branch 'origin/master-2.3'

mantisbt · Apr 22, 2017 · f845b24 · f845b24
2 parents f793714 + 9c9297e
commit f845b24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/core/current_user_api.php b/core/current_user_api.php
@@ -192,7 +192,7 @@ function current_user_get_all_accessible_subprojects( $p_project_id ) {
  * @access public
  */
 function current_user_is_administrator() {
-	return user_is_administrator( auth_get_current_user_id() );
+	return auth_is_user_authenticated() && user_is_administrator( auth_get_current_user_id() );
 }
 
 /**

diff --git a/core/date_api.php b/core/date_api.php
@@ -235,6 +235,7 @@ function print_year_range_option_list( $p_year = 0, $p_start = 0, $p_end = 0 ) {
  * @access public
  */
 function print_date_selection_set( $p_name, $p_format, $p_date = 0, $p_default_disable = false, $p_allow_blank = false, $p_year_start = 0, $p_year_end = 0, $p_input_css = "input-sm" ) {
+	$t_chars = preg_split( '//', $p_format, -1, PREG_SPLIT_NO_EMPTY );
 	if( $p_date != 0 ) {
 		$t_date = preg_split( '/-/', date( 'Y-m-d', $p_date ), -1, PREG_SPLIT_NO_EMPTY );
 	} else {