Changeset 1107:3943962d69b8 for admin/blogs.php

Timestamp:

02/27/13 11:48:32 (13 years ago)

Author:

JcDenis

Branch:

sexy

Parents:

880:02c78f56f430 (diff), 1105:ce855d61f9ce (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 with default branch in 2.5-RC

Files:

• admin/blogs.php (modified) (2 diffs)
• admin/blogs.php (modified) (4 diffs)

admin/blogs.php

@@ -76 +76 @@
 
 if (!empty($_GET['del'])) {
-     echo '<p class="message">'.__('Blog has been successfully deleted.').'</p>';
+     dcPage::message(__('Blog has been successfully deleted.'));
 }
 
@@ -133 +133 @@
           '<th>'.__('Blog name').'</th>'.
           '<th class="nowrap">'.__('Last update').'</th>'.
-          '<th class="nowrap">'.__('Entries').'</th>'.
+          '<th class="nowrap">'.__('Entries (all types)').'</th>'.
           '<th class="nowrap">'.__('Blog ID').'</th>'.
           '<th>&nbsp;</th>'.

admin/blogs.php

@@ -61 +61 @@
 try {
      $counter = $core->getBlogs($params,1);
-     $rs = $core->getBlogs($params);
+     $blogs = $core->getBlogs($params);
      $nb_blog = $counter->f(0);
 } catch (Exception $e) {
@@ -139 +139 @@
           '</tr>';
           
-          while ($rs->fetch()) {
-               echo blogLine($rs);
+          foreach ($blogs as $blog) {
+               echo blogLine($blog);
           }
           
@@ -151 +151 @@
 dcPage::close();
 
-function blogLine($rs)
+function blogLine($blog)
 {
      global $core;
      
-     $blog_id = html::escapeHTML($rs->blog_id);
+     $blog_id = html::escapeHTML($blog->blog_id);
      $edit_link = '';
      
@@ -165 +165 @@
      }
      
-     $img_status = $rs->blog_status == 1 ? 'check-on' : 'check-off';
-     $txt_status = $GLOBALS['core']->getBlogStatus($rs->blog_status);
+     $img_status = $blog->blog_status == 1 ? 'check-on' : 'check-off';
+     $txt_status = $GLOBALS['core']->getBlogStatus($blog->blog_status);
      $img_status = sprintf('<img src="images/%1$s.png" alt="%2$s" title="%2$s" />',$img_status,$txt_status);
      $offset = dt::getTimeOffset($core->auth->getInfo('user_tz'));
-     $blog_upddt = dt::str(__('%Y-%m-%d %H:%M'),strtotime($rs->blog_upddt) + $offset);
+     $blog_upddt = dt::str(__('%Y-%m-%d %H:%M'),strtotime($blog->blog_upddt) + $offset);
      
      return
      '<tr class="line">'.
-     '<td class="maximal"><a href="index.php?switchblog='.$rs->blog_id.'" '.
-     'title="'.sprintf(__('Switch to blog %s'),$rs->blog_id).'">'.
-     html::escapeHTML($rs->blog_name).'</a></td>'.
+     '<td class="maximal"><a href="index.php?switchblog='.$blog->blog_id.'" '.
+     'title="'.sprintf(__('Switch to blog %s'),$blog->blog_id).'">'.
+     html::escapeHTML($blog->blog_name).'</a></td>'.
      '<td class="nowrap">'.$blog_upddt.'</td>'.
-     '<td class="nowrap">'.$core->countBlogPosts($rs->blog_id).'</td>'.
+     '<td class="nowrap">'.$core->countBlogPosts($blog->blog_id).'</td>'.
      '<td class="nowrap">'.$blog_id.'</td>'.
      '<td>'.$edit_link.'</td>'.