[pLog-svn] r2843 - in plog/trunk: class/dao class/database js/editor locale

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2006-01-23 17:43:54 +0000 (Mon, 23 Jan 2006)
New Revision: 2843

Removed:
   plog/trunk/class/database/adodb/
Modified:
   plog/trunk/class/dao/article.class.php
   plog/trunk/js/editor/plogeditor.js
   plog/trunk/locale/locale_de_DE.php
Log:
merged 1.0.3 branch, revs 2757 to 2831. adodb deletion causing problems with merging, more coming shortly

Modified: plog/trunk/class/dao/article.class.php
===================================================================
--- plog/trunk/class/dao/article.class.php	2006-01-22 14:08:42 UTC (rev 2842)
+++ plog/trunk/class/dao/article.class.php	2006-01-23 17:43:54 UTC (rev 2843)
@@ -972,7 +972,7 @@
 			include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
 			
 			// extract all the "res_XX" values
-            $regexp ="/<a.*id=\"res_([0-9]+)\".*>.*<\/a>/im";
+            $regexp ="|<a.*id=\"res_([0-9]+)\".*>.*<\/a>|U";
 			$resources = Array();
 			$galleryResources = new GalleryResources();
     		if( preg_match_all( $regexp, $this->getText(), $out, PREG_SET_ORDER )) {

Modified: plog/trunk/js/editor/plogeditor.js
===================================================================
--- plog/trunk/js/editor/plogeditor.js	2006-01-22 14:08:42 UTC (rev 2842)
+++ plog/trunk/js/editor/plogeditor.js	2006-01-23 17:43:54 UTC (rev 2843)
@@ -266,7 +266,7 @@
 		this.toggle();		
 
 		// if everything went fine, add the link and return
-		var linkTag = '<a href="' + linkDest + '">' + linkDest + '</a>'; 
+		var linkTag = '<a href="' + linkDest + '">' + linkText + '</a>'; 
 		return linkTag;
 	}
 	

Modified: plog/trunk/locale/locale_de_DE.php
===================================================================
--- plog/trunk/locale/locale_de_DE.php	2006-01-22 14:08:42 UTC (rev 2842)
+++ plog/trunk/locale/locale_de_DE.php	2006-01-23 17:43:54 UTC (rev 2843)
@@ -714,7 +714,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'Begrenzung auf maximal ein Blog pro E-Mail Account [Standard = Nein]';
 $messages['help_summary_show_agreement'] = 'Vereinbarung anzeigen und von neuen Benutzern akzeptieren lassen, bevor die Registrierung abgeschlossen wird [Standard = Ja]';
 $messages['help_need_email_confirm_registration'] = 'Neue Benutzer zwingen Ihre Registrierung &uuml;ber das Klicken eines Links zu best&auml;tigen, der Ihnen per E-Mail an Ihren Account gesendet wird [Standard = Ja]';
-$messages['help_summary_disable_registration'] = 'Benutzern erlauben, neue Blogs zu registrieren [Standard = Ja]';
+$messages['help_summary_disable_registration'] = 'Benutzern verbieten, neue Blogs zu registrieren [Standard = Nein]';
 // templates
 $messages['help_template_folder'] = 'Verzeichniss, in dem Templates gespeichert werden [Standard = ./templates]';
 $messages['help_default_template'] = 'Standardtemplate f&uuml;r neue Blogs [Standard = standard]';