Changeset 1315:220e119ae6c8 for inc/core/class.dc.blog.php
- Timestamp:
- 08/09/13 08:01:31 (11 years ago)
- Branch:
- twig
- Parents:
- 1158:9d7267aec27b (diff), 1314:99a1319b79fc (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
inc/core/class.dc.blog.php
r1280 r1315 4 4 # This file is part of Dotclear 2. 5 5 # 6 # Copyright (c) 2003-201 3Olivier Meunier & Association Dotclear6 # Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear 7 7 # Licensed under the GPL version 2.0 license. 8 8 # See LICENSE file or … … 81 81 $this->desc = $b->blog_desc; 82 82 $this->url = $b->blog_url; 83 $this->host = http::getHostFromURL($this->url);83 $this->host = preg_replace('|^([a-z]{3,}://)(.*?)/.*$|','$1$2',$this->url); 84 84 $this->creadt = strtotime($b->blog_creadt); 85 85 $this->upddt = strtotime($b->blog_upddt); … … 805 805 806 806 if (!empty($params['user_id'])) { 807 $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."'";807 $strReq .= "AND U.user_id ".$this->con->in($params['user_id'])." "; 808 808 } 809 809 … … 889 889 $strReq .= 'ORDER BY post_dt DESC '; 890 890 } 891 } 892 893 if (!$count_only && !empty($params['limit'])) { 894 $strReq .= $this->con->limit($params['limit']); 891 if (!empty($params['limit'])) { 892 $strReq .= $this->con->limit($params['limit']); 893 } 895 894 } 896 895
Note: See TracChangeset
for help on using the changeset viewer.