Changeset 3340:30cec05f4e63 for 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:

admin

Files:

• categories.php (modified) (1 diff)
• media.php (modified) (2 diffs)
• post.php (modified) (1 diff)
• preferences.php (modified) (1 diff)

admin/categories.php

@@ -47 +47 @@
           $mov_cat = (int) $_POST['mov_cat'][$cat_id];
 
-          $mov_cat = $mov_cat ? $mov_cat : null;
+          $mov_cat = $mov_cat ?: null;
           if ($mov_cat !== null) {
                $c = $core->blog->getCategory($mov_cat);

admin/media.php

@@ -35 +35 @@
 
 $page = !empty($_GET['page']) ? max(1,(integer) $_GET['page']) : 1;
-$nb_per_page = ((integer) $core->auth->user_prefs->interface->media_by_page ? (integer) $core->auth->user_prefs->interface->media_by_page : 30);
+$nb_per_page = ((integer) $core->auth->user_prefs->interface->media_by_page ?: 30);
 
 # We are on home not comming from media manager
@@ -161 +161 @@
                $zip->addDirectory($core->media->root.'/'.$d,'',true);
 
-               header('Content-Disposition: attachment;filename='.date('Y-m-d').'-'.$core->blog->id.'-'.($d ? $d : 'media').'.zip');
+               header('Content-Disposition: attachment;filename='.date('Y-m-d').'-'.$core->blog->id.'-'.($d ?: 'media').'.zip');
                header('Content-Type: application/x-zip');
                $zip->write();

admin/post.php

@@ -272 +272 @@
 
      $cur->post_title = $post_title;
-     $cur->cat_id = ($cat_id ? $cat_id : null);
+     $cur->cat_id = ($cat_id ?: null);
      $cur->post_dt = $post_dt ? date('Y-m-d H:i:00',strtotime($post_dt)) : '';
      $cur->post_format = $post_format;

admin/preferences.php

@@ -47 +47 @@
 $user_ui_iconset = @$core->auth->user_prefs->interface->iconset;
 $user_ui_nofavmenu = $core->auth->user_prefs->interface->nofavmenu;
-$user_ui_media_by_page = ($core->auth->user_prefs->interface->media_by_page ? $core->auth->user_prefs->interface->media_by_page : 30);
+$user_ui_media_by_page = ($core->auth->user_prefs->interface->media_by_page ?: 30);
 $user_ui_media_nb_last_dirs = $core->auth->user_prefs->interface->media_nb_last_dirs;