Changeset 3126:19af5f62e940 for inc/core/class.dc.core.php

Timestamp:

10/25/15 10:09:44 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

3128:3863cfaaae8d, 3130:dc667b6545bf

Parents:

3118:5c671c6fae8a (diff), 3125:3491c455735d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.8.2 into 2.9 (default)

Files:

• inc/core/class.dc.core.php (modified) (1 diff)
• inc/core/class.dc.core.php (modified) (1 diff)

inc/core/class.dc.core.php

@@ -1380 +1380 @@
                     array('lang','string','en',
                     'Default blog language'),
-                    array('media_exclusion','string','/\.php[0-9]*$/i',
+                    array('media_exclusion','string','/\.(phps?|pht(ml)?|phl)[0-9]*$/i',
                     'File name exclusion pattern in media manager. (PCRE value)'),
                     array('media_img_m_size','integer',448,

inc/core/class.dc.core.php

@@ -1390 +1390 @@
                     array('media_img_title_pattern','string','Title ;; Date(%b %Y) ;; separator(, )',
                     'Pattern to set image title when you insert it in a post'),
+                    array('media_video_width','integer',400,
+                    'Video width in media manager'),
+                    array('media_video_height','integer',300,
+                    'Video height in media manager'),
                     array('nb_post_for_home','integer',20,
                     'Number of entries on first home page'),