hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1206 from nlegoff/fix-patch

Browse Source 
[3.8] Fix migration patch
This commit is contained in:
Nicolas Le Goff
2015-01-12 14:28:27 +01:00
parent 9554f063c6 3352dfb423
commit bae5b85dbe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/patch/320alpha4b.php
View File

@@ -81,7 +81,7 @@ class patch_320alpha4b implements patchInterface
foreach ($rs as $row) { foreach ($rs as $row) {
$user = User_Adapter::getInstance($row['usr_id'], $app); $user = User_Adapter::getInstance($row['usr_id'], $app);
$feed = $this->get_feed($appbox, $user, $row['pub_restrict'], $row['homelink']); $feed = $this->get_feed($app, $appbox, $user, $row['pub_restrict'], $row['homelink']);
if (! $feed instanceof Feed_Adapter) { if (! $feed instanceof Feed_Adapter) {
continue; continue;
@@ -138,7 +138,7 @@ class patch_320alpha4b implements patchInterface
} }
protected static $feeds = array(); protected static $feeds = array();
protected function get_feed(appbox $appbox, User_Adapter $user, $pub_restrict, $homelink) protected function get_feed(Application $app, appbox $appbox, User_Adapter $user, $pub_restrict, $homelink)
{ {
$user_key = 'user_' . $user->get_id(); $user_key = 'user_' . $user->get_id();
if ($homelink == '1') if ($homelink == '1')