Changeset 3340:30cec05f4e63 for inc/admin

Timestamp:

09/09/16 13:30:35 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

PHP 5.3+ : (expr1 ? expr1 : expr2) may be written → (expr1 ?: expr2)

Location:

inc/admin

Files:

• lib.dc.page.php (modified) (3 diffs)
• lib.themeconfig.php (modified) (2 diffs)

inc/admin/lib.dc.page.php

@@ -106 +106 @@
                // Get directives from settings if exist, else set defaults
                $csp = new ArrayObject(array());
-               $csp['default-src'] = $core->blog->settings->system->csp_admin_default ? $core->blog->settings->system->csp_admin_default : "'self'";
-               $csp['script-src'] = $core->blog->settings->system->csp_admin_script ? $core->blog->settings->system->csp_admin_script : "'self' 'unsafe-inline' 'unsafe-eval'";
-               $csp['style-src'] = $core->blog->settings->system->csp_admin_style ? $core->blog->settings->system->csp_admin_style : "'self' 'unsafe-inline'";
-               $csp['img-src'] = $core->blog->settings->system->csp_admin_img ? $core->blog->settings->system->csp_admin_img : "'self' data: media.dotaddict.org";
+               $csp['default-src'] = $core->blog->settings->system->csp_admin_default ?: "'self'";
+               $csp['script-src'] = $core->blog->settings->system->csp_admin_script ?: "'self' 'unsafe-inline' 'unsafe-eval'";
+               $csp['style-src'] = $core->blog->settings->system->csp_admin_style ?: "'self' 'unsafe-inline'";
+               $csp['img-src'] = $core->blog->settings->system->csp_admin_img ?: "'self' data: media.dotaddict.org";
 
                # Cope with blog post preview (via public URL in iframe)
@@ -298 +298 @@
      {
           global $core;
-          $tag = (isset($n['divtag'])&& $n['divtag'])?'div':'p';
+          $tag = (isset($n['divtag']) && $n['divtag']) ? 'div' : 'p';
           $ts = '';
           if (!isset($n['with_ts']) || ($n['with_ts'] == true)) {
@@ -442 +442 @@
      {
           global $core;
-          $with_home_link = isset($options['home_link'])?$options['home_link']:true;
-          $hl = isset($options['hl'])?$options['hl']:true;
-          $hl_pos = isset($options['hl_pos'])?$options['hl_pos']:-1;
+          $with_home_link = isset($options['home_link']) ? $options['home_link'] : true;
+          $hl = isset($options['hl']) ? $options['hl'] : true;
+          $hl_pos = isset($options['hl_pos']) ? $options['hl_pos'] : -1;
           // First item of array elements should be blog's name, System or Plugins
           $res = '<h2>'.($with_home_link ?

inc/admin/lib.themeconfig.php

@@ -71 +71 @@
 
           // Eval font size in em (assume base font size in pixels equal to 16)
-          if (preg_match('/^([0-9.]+)\s*(%|pt|px|em|ex)?$/',$size,$m)) {
+          if (preg_match('/^([0-9.]+)\s*(%|pt|px|em|ex|rem)?$/',$size,$m)) {
                if (empty($m[2])) {
                     $m[2] = 'em';
@@ -144 +144 @@
      public static function adjustFontSize($s)
      {
-          if (preg_match('/^([0-9.]+)\s*(%|pt|px|em|ex)?$/',$s,$m)) {
+          if (preg_match('/^([0-9.]+)\s*(%|pt|px|em|ex|rem)?$/',$s,$m)) {
                if (empty($m[2])) {
                     $m[2] = 'em';