[phpws-comm-commits] modules/wiki/class WikiManager.php,1.67,1.68

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/wiki/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18725/class

Modified Files:
	WikiManager.php 
Log Message:
Fixed image on SamplePage and SandBox pages.

Index: WikiManager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/class/WikiManager.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** WikiManager.php	29 May 2007 02:43:21 -0000	1.67
--- WikiManager.php	3 Jan 2008 16:29:38 -0000	1.68
***************
*** 246,250 ****
          $tags['IMAGE_UPLOAD_LABEL'] = dgettext('wiki', 'Image Upload');
          $tags['IMAGE_LIST_LABEL']   = dgettext('wiki', 'Image List');
!         $tags['USAGE']              = sprintf(dgettext('wiki', 'To include an image in a page, use %s.'), '[[image picture.jpg]]');
          $tags['LIST_FILENAME']      = dgettext('wiki', 'Filename');
          $tags['LIST_SIZE']          = dgettext('wiki', 'Size');
--- 246,251 ----
          $tags['IMAGE_UPLOAD_LABEL'] = dgettext('wiki', 'Image Upload');
          $tags['IMAGE_LIST_LABEL']   = dgettext('wiki', 'Image List');
!         $tags['USAGE']              = sprintf(dgettext('wiki', 'To include an image in a page, use %s.'),
!                                               '[[image picture.jpg]]');
          $tags['LIST_FILENAME']      = dgettext('wiki', 'Filename');
          $tags['LIST_SIZE']          = dgettext('wiki', 'Size');
***************
*** 310,318 ****
          $db->addColumn('title');
          $result = $db->select('col');
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!         }
!         else if ($result != NULL)
          {
              PHPWS_Core::reroute(PHPWS_Text::linkAddress('wiki', array('page'=>$result[0])));
--- 311,316 ----
          $db->addColumn('title');
          $result = $db->select('col');
! 
!         if (!PHPWS_Error::logIfError($result) && ($result != NULL))
          {
              PHPWS_Core::reroute(PHPWS_Text::linkAddress('wiki', array('page'=>$result[0])));
***************
*** 338,342 ****
              ($_REQUEST['page_op']=='view') && (PHPWS_Settings::get('wiki', 'what_links_here')))
          {
!             $links[] = PHPWS_Text::moduleLink($linkshere, 'wiki', array('page'=>$_REQUEST['page'], 'page_op'=>'whatlinkshere'));
          }
  
--- 336,341 ----
              ($_REQUEST['page_op']=='view') && (PHPWS_Settings::get('wiki', 'what_links_here')))
          {
!             $links[] = PHPWS_Text::moduleLink($linkshere, 'wiki',
!                                               array('page'=>$_REQUEST['page'], 'page_op'=>'whatlinkshere'));
          }