friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

sql issue item_store

This commit is contained in:
Friendika 2011-10-13 01:00:06 -07:00
parent ac3a6d1d1e
commit 2911bf9434
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php'); require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika'); define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
define ( 'FRIENDIKA_VERSION', '2.3.1131' ); define ( 'FRIENDIKA_VERSION', '2.3.1132' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1095 ); define ( 'DB_UPDATE_VERSION', 1095 );

4
include/items.php
View File

@ -818,14 +818,14 @@ function item_store($arr,$force_parent = false) {
// find the item we just created // find the item we just created
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1 ORDER BY `id` ASC", $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC LIMIT 1",
$arr['uri'], // already dbesc'd $arr['uri'], // already dbesc'd
intval($arr['uid']) intval($arr['uid'])
); );
if(! count($r)) { if(! count($r)) {
// This is not good, but perhaps we encountered a rare race/cache condition, so back off and try again. // This is not good, but perhaps we encountered a rare race/cache condition, so back off and try again.
sleep(3); sleep(3);
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1 ORDER BY `id` ASC", $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC LIMIT 1",
$arr['uri'], // already dbesc'd $arr['uri'], // already dbesc'd
intval($arr['uid']) intval($arr['uid'])
); );

2
view/theme/duepuntozero/style.css
View File

@ -1861,7 +1861,7 @@ a.mail-list-link {
.widget { .widget {
border: 1px solid #DDDDDD; border: 1px solid #DDDDDD;
padding: 5px; padding: 8px;
margin-top: 5px; margin-top: 5px;
-moz-border-radius:5px; -moz-border-radius:5px;
-webkit-border-radius:5px; -webkit-border-radius:5px;