Changeset 2159:d709a73eb75b for inc

Timestamp:

09/30/13 09:51:02 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

blog_count was only set when getPermissions was called.
Add a new method (getBlogCount()) that used blog_count param or retrieved it from database.
close 1545

Location:

inc

Files:

• admin/lib.dc.page.php (modified) (2 diffs)
• admin/prepend.php (modified) (1 diff)
• core/class.dc.auth.php (modified) (2 diffs)

inc/admin/lib.dc.page.php

@@ -54 +54 @@
 
           # List of user's blogs
-          if ($core->auth->blog_count == 1 || $core->auth->blog_count > 20)
+          if ($core->auth->getBlogCount() == 1 || $core->auth->getBlogCount() > 20)
           {
                $blog_box =
@@ -60 +60 @@
                html::escapeHTML($core->blog->name).'</strong>';
 
-               if ($core->auth->blog_count > 20) {
+               if ($core->auth->getBlogCount() > 20) {
                     $blog_box .= ' - <a href="blogs.php">'.__('Change blog').'</a>';
                }

inc/admin/prepend.php

@@ -351 +351 @@
           preg_match('/blogs.php$/',$_SERVER['REQUEST_URI']),
           $core->auth->isSuperAdmin() ||
-          $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->blog_count > 1);
+          $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->getBlogCount() > 1);
 
      if (!$user_ui_nofavmenu) {

inc/core/class.dc.auth.php

@@ -377 +377 @@
                return $this->blogs[$blog_id];
           }
-          
-          if ($this->blog_count === null) {
-               $this->blog_count = $this->core->getBlogs(array(),true)->f(0);
-          }
-          
+
           if ($this->user_admin) {
                $strReq = 'SELECT blog_id '.
@@ -404 +400 @@
           return $this->blogs[$blog_id];
      }
+
+    public function getBlogCount() {
+          if ($this->blog_count === null) {
+               $this->blog_count = $this->core->getBlogs(array(),true)->f(0);
+          }
+
+        return $this->blog_count;
+    }
      
      public function findUserBlog($blog_id=null)