richard
/
sorbetcms
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Fixed some rare things with admin/index.php

master
pecesama 2008-10-28 20:18:13 +00:00
parent 9c55bb7f3d
commit 72aa79ab64
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/index.php
View File

@ -279,10 +279,10 @@ if ($user->isAuthenticated()) {
$row['Caption'] = $register["description"]; $row['Caption'] = $register["description"];
break; break;
} }
<<<<<<< .mine
$rows[] = $row; $rows[] = $row;
} }
=======
$limit=$conf->postLimit; $limit=$conf->postLimit;
@ -319,7 +319,9 @@ if ($user->isAuthenticated()) {
} else { } else {
$photoPath = $register["url"]; $photoPath = $register["url"];
} }
>>>>>>> .r241 }
}
}
$p = new pagination; $p = new pagination;
$p->items($tumble->getPostsNumber()); $p->items($tumble->getPostsNumber());