phpwiki-checkins Mailing List for PhpWiki

Revision: 9697
 http://sourceforge.net/p/phpwiki/code/9697
Author: vargenau
Date: 2015年05月12日 14:32:46 +0000 (2015年5月12日)
Log Message:
-----------
Avoid warning
Modified Paths:
--------------
 trunk/lib/imagecache.php
 trunk/lib/main.php
Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php	2015年05月07日 08:48:22 UTC (rev 9696)
+++ trunk/lib/imagecache.php	2015年05月12日 14:32:46 UTC (rev 9697)
@@ -77,7 +77,7 @@
 }
 if ($userid = $request->getCookieVar(getCookieName())) {
 if (!empty($userid) and substr($userid, 0, 2) != 's:') {
- $request->_user->authhow = 'cookie';
+ $request->_user->_authhow = 'cookie';
 return $userid;
 }
 }
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015年05月07日 08:48:22 UTC (rev 9696)
+++ trunk/lib/main.php	2015年05月12日 14:32:46 UTC (rev 9697)
@@ -998,7 +998,7 @@
 
 if ($userid = $this->getCookieVar(getCookieName())) {
 if (!empty($userid) and substr($userid, 0, 2) != 's:') {
- $this->_user->authhow = 'cookie';
+ $this->_user->_authhow = 'cookie';
 return $userid;
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9696
 http://sourceforge.net/p/phpwiki/code/9696
Author: vargenau
Date: 2015年05月07日 08:48:22 +0000 (2015年5月07日)
Log Message:
-----------
Remove unused var is_opera_seven
Modified Paths:
--------------
 trunk/themes/MonoBook/wikibits.js
Modified: trunk/themes/MonoBook/wikibits.js
===================================================================
--- trunk/themes/MonoBook/wikibits.js	2015年05月07日 08:46:08 UTC (rev 9695)
+++ trunk/themes/MonoBook/wikibits.js	2015年05月07日 08:48:22 UTC (rev 9696)
@@ -10,7 +10,6 @@
 var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled ));
 if (clientPC.indexOf('opera')!=-1) {
 var is_opera = true;
- var is_opera_seven = (window.opera && document.childNodes);
 }
 
 // add any onload functions in this hook (please don't hard-code any events in the xhtml source)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9695
 http://sourceforge.net/p/phpwiki/code/9695
Author: vargenau
Date: 2015年05月07日 08:46:08 +0000 (2015年5月07日)
Log Message:
-----------
Remove unused function addButton
Modified Paths:
--------------
 trunk/themes/MonoBook/wikibits.js
 trunk/themes/default/toolbar.js
Modified: trunk/themes/MonoBook/wikibits.js
===================================================================
--- trunk/themes/MonoBook/wikibits.js	2015年04月23日 18:49:33 UTC (rev 9694)
+++ trunk/themes/MonoBook/wikibits.js	2015年05月07日 08:46:08 UTC (rev 9695)
@@ -226,34 +226,6 @@
 	}
 }
 
-// this function generates the actual toolbar buttons with localized text
-// we use it to avoid creating the toolbar where javascript is not enabled
-function addButton(imageFile, speedTip, tagOpen, tagClose, sampleText) {
-
-	speedTip=escapeQuotes(speedTip);
-	tagOpen=escapeQuotes(tagOpen);
-	tagClose=escapeQuotes(tagClose);
-	sampleText=escapeQuotes(sampleText);
-	var mouseOver="";
-
-	// we can't change the selection, so we show example texts
-	// when moving the mouse instead, until the first button is clicked
-	if(!document.selection && !is_gecko) {
-		// filter backslashes so it can be shown in the infobox
-		var re=new RegExp("\\\\n","g");
-		tagOpen=tagOpen.replace(re,"");
-		tagClose=tagClose.replace(re,"");
-		mouseOver = "onMouseover=\"if(!noOverwrite){document.infoform.infobox.value='"+tagOpen+sampleText+tagClose+"'};\"";
-	}
-
-	document.write("<a href=\"javascript:insertTags");
-	document.write("('"+tagOpen+"','"+tagClose+"','"+sampleText+"');\">");
-
- document.write("<img width=\"23\" height=\"22\" src=\""+imageFile+"\" border=\"0\" ALT=\""+speedTip+"\" TITLE=\""+speedTip+"\""+mouseOver+">");
-	document.write("</a>");
-	return;
-}
-
 function escapeQuotes(text) {
 	var re=new RegExp("'","g");
 	text=text.replace(re,"\\'");
Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2015年04月23日 18:49:33 UTC (rev 9694)
+++ trunk/themes/default/toolbar.js	2015年05月07日 08:46:08 UTC (rev 9695)
@@ -8,21 +8,6 @@
 if( window.top != window ) window.top.location = window.location;
 var pullwin;
 
-// This function generates the actual toolbar buttons with localized text
-// We use it to avoid creating the toolbar where javascript is not enabled
-// Not all buttons use this helper, some need special javascript treatment.
-function addButton(imageFile, speedTip, func, args) {
- var i;
- speedTip=escapeQuotes(speedTip);
- document.write("<a href=\"javascript:"+func+"(");
- for (i=0; i<args.length; i++){
- if (i>0) document.write(",");
- document.write("'"+escapeQuotes(args[i])+"'");
- }
- document.write(");\"><img src=\""+imageFile+"\" alt=\""+speedTip+"\" title=\""+speedTip+"\">");
- document.write("</a>");
-}
-
 // This function generates a popup list to select from.
 // plugins, pagenames, categories, templates.
 // Not with document.write because we cannot use self.opener then.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.