Changeset 1490:60501ef579eb for inc/core

Timestamp:

08/19/13 08:04:33 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

1489:f2398e7f3395 (diff), 1466:e67efe636ce1 (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:

Fusion avec default

File:

• inc/core/class.dc.blog.php (modified) (5 diffs)

inc/core/class.dc.blog.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -81 +81 @@
                $this->desc = $b->blog_desc;
                $this->url = $b->blog_url;
-               $this->host = http::getHostFromURL($this->url);
+               $this->host = preg_replace('|^([a-z]{3,}://)(.*?)/.*$|','$1$2',$this->url);
                $this->creadt = strtotime($b->blog_creadt);
                $this->upddt = strtotime($b->blog_upddt);
@@ -91 +91 @@
                $this->public_path = path::fullFromRoot($this->settings->system->public_path,DC_ROOT);
                
-               $this->post_status['-2'] = __('Pending');
-               $this->post_status['-1'] = __('Scheduled');
-               $this->post_status['0'] = __('Unpublished');
-               $this->post_status['1'] = __('Published');
-               
-               $this->comment_status['-2'] = __('Junk');
-               $this->comment_status['-1'] = __('Pending');
-               $this->comment_status['0'] = __('Unpublished');
-               $this->comment_status['1'] = __('Published');
+               $this->post_status['-2'] = __('pending');
+               $this->post_status['-1'] = __('scheduled');
+               $this->post_status['0'] = __('unpublished');
+               $this->post_status['1'] = __('published');
+               
+               $this->comment_status['-2'] = __('junk');
+               $this->comment_status['-1'] = __('pending');
+               $this->comment_status['0'] = __('unpublished');
+               $this->comment_status['1'] = __('published');
                
                # --BEHAVIOR-- coreBlogConstruct
@@ -805 +805 @@
           
           if (!empty($params['user_id'])) {
-               $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
+               $strReq .= "AND U.user_id ".$this->con->in($params['user_id'])." ";
           }
           
@@ -889 +889 @@
                     $strReq .= 'ORDER BY post_dt DESC ';
                }
-          }
-          
-          if (!$count_only && !empty($params['limit'])) {
-               $strReq .= $this->con->limit($params['limit']);
+               if (!empty($params['limit'])) {
+                    $strReq .= $this->con->limit($params['limit']);
+               }
           }