class.bookmarks_bo.inc.php

ralfbecker_sf 2016-03-09 11:38:24 UTC #1

Author: ralfbecker
New Revision: 55327

URL: http://svn.stylite.de/viewvc/egroupware?rev=55327&view=rev
Log:

Bookmarks: fixed not displayed favicon for new bookmarks

Modified:
branches/14.2/bookmarks/ (props changed)
branches/14.2/bookmarks/inc/class.bookmarks_bo.inc.php

Propchange: branches/14.2/bookmarks/

— svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 12:38:24 2016
@@ -1,1 +1,1 @@
-/trunk/bookmarks:51662,51665,51752,51812,51817,51835,51872,51877,51917,51954,52005-52006,52025,53561-53562,53583,53605,53618,53629,53754,53778,54169,54767,54867,54877
+/trunk/bookmarks:51662,51665,51752,51812,51817,51835,51872,51877,51917,51954,52005-52006,52025,53561-53562,53583,53605,53618,53629,53754,53778,54169,54767,54867,54877,55326

Modified: branches/14.2/bookmarks/inc/class.bookmarks_bo.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/bookmarks/inc/class.bookmarks_bo.inc.php?rev=55327&r1=55326&r2=55327&view=diff

— branches/14.2/bookmarks/inc/class.bookmarks_bo.inc.php (original)
+++ branches/14.2/bookmarks/inc/class.bookmarks_bo.inc.php Wed Mar 9 12:38:24 2016
@@ -101,10 +101,9 @@
foreach($rows as $key => &$row) {
$favicon = egw_link::vfs_path(‘bookmarks’, $row[‘id’], ‘favicon.png’, true);

  		//if(egw_vfs::is_dir(egw_link::vfs_path('bookmarks',$row['id'])) && egw_vfs::stat($favicon))
  		if(@egw_vfs::stat($favicon))
  		{

  			$row['favicon'] = 'vfs:'.$favicon;

  			$row['favicon'] = egw::link(egw_vfs::download_url($favicon));
  		}

  		$readonlys["edit[{$row['id']}]"] = !$this->check_perms2($row['owner'], $row['access'], EGW_ACL_READ) &&

@@ -182,7 +181,7 @@
{
if ($this->so->exists($values[‘url’]))
{

  			$this->error_msg .= sprintf('<br>URL <B>%s</B> already exists!', $values['url']);

  			$this->error_msg .= lang('URL "%1" already exists!', $values['url']);
  			return False;
  		}
  		$bm_id = $this->so->add($values);

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785111&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs