Changeset 3126:19af5f62e940

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:

• .hgtags (modified) (1 diff)
• .hgtags (modified) (1 diff)
• admin/comments.php (modified) (1 diff)
• admin/comments.php (modified) (1 diff)
• inc/core/class.dc.core.php (modified) (1 diff)
• inc/core/class.dc.core.php (modified) (1 diff)
• inc/dbschema/upgrade.php (modified) (1 diff)
• inc/dbschema/upgrade.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)

.hgtags

@@ -27 +27 @@
 5e377b0f479e0f45cf199b24c3f997449a6f5a8a 2.8.0
 7b52a5c13c7e8129f9a07f38482fe58b25e96349 2.8.1
+25c8ab368aa552f1334f5258e110252c07332a5a 2.8.2

.hgtags

@@ -25 +25 @@
 c45489df2bde825c7ed9c756e00444b54caf8e10 2.7.3
 27e258e592e45b56a803038279adb6faa5865265 2.7.4
+5e377b0f479e0f45cf199b24c3f997449a6f5a8a 2.8.0
 7b52a5c13c7e8129f9a07f38482fe58b25e96349 2.8.1
 25c8ab368aa552f1334f5258e110252c07332a5a 2.8.2

admin/comments.php

@@ -271 +271 @@
      form::hidden(array('sortby'),$sortby).
      form::hidden(array('order'),$order).
-     form::hidden(array('author'),preg_replace('/%/','%%',$author)).
+     form::hidden(array('author'),html::escapeHTML(preg_replace('/%/','%%',$author))).
      form::hidden(array('status'),$status).
      form::hidden(array('ip'),preg_replace('/%/','%%',$ip)).

admin/comments.php

@@ -245 +245 @@
      '<p><label for="order" class="ib">'.__('Sort:').'</label> '.
      form::combo('order',$order_combo,$order).'</p>'.
-     '<p><span class="label ib">Afficher</span> <label for="nb" class="classic">'.
+     '<p><span class="label ib">'.__('Show').'</span> <label for="nb" class="classic">'.
      form::field('nb',3,3,$nb_per_page).' '.
      __('comments per page').'</label></p>'.

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'),

inc/dbschema/upgrade.php

@@ -455 +455 @@
                }
 
+               if (version_compare($version,'2.8.1','<'))
+               {
+                    # Update flie exclusion upload regex
+                    $strReq = 'UPDATE '.$core->prefix.'setting '.
+                              " SET setting_value = '/\\.(phps?|pht(ml)?|phl)[0-9]*\$/i' ".
+                              " WHERE setting_id = 'media_exclusion' ".
+                              " AND setting_ns = 'system' ".
+                              " AND (setting_value = '/\\.php[0-9]*\$/i' ".
+                              "   OR setting_value = '/\\.php\$/i') ";
+                    $core->con->execute($strReq);
+               }
+
                if (version_compare($version,'2.9','<'))
                {

inc/dbschema/upgrade.php

@@ -467 +467 @@
                }
 
+               if (version_compare($version,'2.9','<'))
+               {
+                    # Some new settings should be initialized, prepare db queries
+                    $strReq = 'INSERT INTO '.$core->prefix.'setting'.
+                              ' (setting_id,setting_ns,setting_value,setting_type,setting_label)'.
+                              ' VALUES(\'%s\',\'system\',\'%s\',\'integer\',\'%s\')';
+                    $core->con->execute(sprintf($strReq,'media_video_width','400','Media video insertion width'));
+                    $core->con->execute(sprintf($strReq,'media_video_height','300','Media video insertion height'));
+               }
+
                $core->setVersion('core',DC_VERSION);
                $core->blogDefaults();

inc/prepend.php

@@ -140 +140 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.8.3');
+define('DC_VERSION','2.9-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');