Changeset 22299

Timestamp:

10/25/2012 08:15:47 PM (12 years ago)

Author:

nacin

Message:

Don't show the same time or date format twice on the General Settings page. This can occur if a translated format is the same as an existing default format. fixes #21060.

File:

• trunk/wp-admin/options-general.php (modified) (2 diffs)

trunk/wp-admin/options-general.php

@@ -231 +231 @@
 <?php
 
-    $date_formats = apply_filters( 'date_formats', array(
+    $date_formats = array_unique( apply_filters( 'date_formats', array(
         __('F j, Y'),
         'Y/m/d',
         'm/d/Y',
         'd/m/Y',
-    ) );
+    ) ) );
 
     $custom = true;
@@ -264 +264 @@
 <?php
 
-    $time_formats = apply_filters( 'time_formats', array(
+    $time_formats = array_unique( apply_filters( 'time_formats', array(
         __('g:i a'),
         'g:i A',
         'H:i',
-    ) );
+    ) ) );
 
     $custom = true;