[evolvis-commits] r17589: Committed missing quilt patches

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Oct 10 15:07:55 CEST 2011


Author: mirabilos
Date: 2011-10-10 15:07:54 +0200 (Mon, 10 Oct 2011)
New Revision: 17589

Removed:
   trunk/gforge_base/evolvisforge-5.1/src/common/rss/simplepie.inc
Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_Rss.class.php
   trunk/gforge_base/evolvisforge-5.1/src/debian/patches/series
   trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
Log:
Committed missing quilt patches

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_Rss.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_Rss.class.php	2011-10-10 13:07:45 UTC (rev 17588)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_Rss.class.php	2011-10-10 13:07:54 UTC (rev 17589)
@@ -45,7 +45,7 @@
 					return idn_to_unicode($param);
 				}
 			}
-			require_once('common/rss/simplepie.inc');
+			require_once('/usr/share/php/simplepie/simplepie.inc');
 			if (!is_dir(forge_get_config('sys_var_path') .'/rss')) {
 				mkdir(forge_get_config('sys_var_path') .'/rss');
 			}
@@ -128,12 +128,7 @@
 			$vTitle = new Valid_String('title');
 			$vTitle->required();
 			if (!$request->validInArray('rss', $vTitle)) {
-				if (function_exists('idn_to_utf8()')) {
-					require_once('simplepie/simplepie.inc');
-				}
-				else {
-					require_once('common/rss/simplepie.inc');
-				}
+				require_once('/usr/share/php/simplepie/simplepie.inc');
 				if (!is_dir(forge_get_config('sys_var_path') .'/rss')) {
 					mkdir(forge_get_config('sys_var_path') .'/rss');
 				}

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/patches/series
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/patches/series	2011-10-10 13:07:45 UTC (rev 17588)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/patches/series	2011-10-10 13:07:54 UTC (rev 17589)
@@ -1,7 +0,0 @@
-disable-tracker-reply-by-email.patch
-disable-dav.patch
-use-snoopy-from-distro.patch
-use-nusoap-from-distro.patch
-use-jquery-from-distro.patch
-use-simplepie-from-distro.patch
-production-environment.patch

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-10-10 13:07:45 UTC (rev 17588)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-10-10 13:07:54 UTC (rev 17589)
@@ -358,14 +358,14 @@
 }
 
 function html_use_jquery() {
-    use_javascript('/scripts/jquery/jquery.min.js');
+	use_javascript('/scripts/jquery/jquery.min.js');
 }
 
 function html_use_tooltips() {
 	html_use_jquery();
 	use_javascript('/scripts/jquery-tipsy/jquery.tipsy.js');
 	use_javascript('/js/tooltips.js');
-	use_stylesheet('/scripts/jquery-tipsy/src/stylesheets/tipsy.css');
+	use_stylesheet('/scripts/jquery-tipsy/stylesheets/tipsy.css');
 }
 
 /**



More information about the evolvis-commits mailing list