phpwiki-checkins Mailing List for PhpWiki

Revision: 9454
 http://sourceforge.net/p/phpwiki/code/9454
Author: vargenau
Date: 2014年12月19日 15:49:55 +0000 (2014年12月19日)
Log Message:
-----------
Remove dead URL
Modified Paths:
--------------
 trunk/lib/HtmlElement.php
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2014年12月19日 15:49:15 UTC (rev 9453)
+++ trunk/lib/HtmlElement.php	2014年12月19日 15:49:55 UTC (rev 9454)
@@ -658,14 +658,12 @@
 */
 function JavaScript($js, $script_args = array())
 {
- $default_script_args = array( //'version' => 'JavaScript', // not xhtml conformant
- 'type' => 'text/javascript');
+ $default_script_args = array('type' => 'text/javascript');
 $script_args = $script_args ? array_merge($default_script_args, $script_args)
 : $default_script_args;
 if (empty($js))
 return HTML(HTML::script($script_args), "\n");
 else
- // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
 return HTML(HTML::script($script_args,
 new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
 . "\n" . trim($js) . "\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9453
 http://sourceforge.net/p/phpwiki/code/9453
Author: vargenau
Date: 2014年12月19日 15:49:15 +0000 (2014年12月19日)
Log Message:
-----------
Indent
Modified Paths:
--------------
 trunk/lib/WikiPlugin.php
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2014年12月19日 15:32:20 UTC (rev 9452)
+++ trunk/lib/WikiPlugin.php	2014年12月19日 15:49:15 UTC (rev 9453)
@@ -384,7 +384,8 @@
 {
 if (!$request) {
 $request =& $GLOBALS['request'];
- } $dbi = $request->getDbh();
+ }
+ $dbi = $request->getDbh();
 return $this->makeBox('', $this->run($dbi, $args, $request, $basepage));
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9452
 http://sourceforge.net/p/phpwiki/code/9452
Author: vargenau
Date: 2014年12月19日 15:32:20 +0000 (2014年12月19日)
Log Message:
-----------
Update PHP Doc
Modified Paths:
--------------
 trunk/lib/ArchiveCleaner.php
Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php	2014年12月19日 13:37:02 UTC (rev 9451)
+++ trunk/lib/ArchiveCleaner.php	2014年12月19日 15:32:20 UTC (rev 9452)
@@ -27,10 +27,10 @@
 }
 
 /**
- * @param $revision
+ * @param WikiDB_PageRevision $revision
 * @return bool
 */
- function isMergeable($revision)
+ private function isMergeable($revision)
 {
 if (!$revision->get('is_minor_edit'))
 return false;
@@ -44,21 +44,18 @@
 && $author_id == $previous->get('author_id');
 }
 
- function cleanDatabase($dbi)
+ /**
+ * @param WikiDB_Page $page
+ */
+ public function cleanPageRevisions($page)
 {
- $iter = $dbi->getAllPages();
- while ($page = $iter->next())
- $this->cleanPageRevisions($page);
- }
-
- function cleanPageRevisions($page)
- {
 $INFINITY = 0x7fffffff;
 
 $expire = &$this->expire_params;
 $counter = array();
- foreach (array('major', 'minor', 'author') as $class)
- $counter[$class] = new ArchiveCleaner_Counter($expire[$class]);
+ $counter['major'] = new ArchiveCleaner_Counter($expire['major']);
+ $counter['minor'] = new ArchiveCleaner_Counter($expire['minor']);
+ $counter['author'] = new ArchiveCleaner_Counter($expire['author']);
 // shortcut to keep all
 if (($counter['minor']->min_keep == $INFINITY)
 and ($counter['major']->min_keep == $INFINITY)
@@ -134,7 +131,11 @@
 
 }
 
- function computeAge($revision)
+ /**
+ * @param WikiDB_PageRevision $revision
+ * @return float|int
+ */
+ private function computeAge($revision)
 {
 $supplanted = $revision->get('_supplanted');
 
@@ -160,6 +161,10 @@
 return ($this->now - $supplanted) / (24 * 3600);
 }
 
+ /**
+ * @param WikiDB_PageRevision $revision
+ * @return bool
+ */
 function keep($revision)
 {
 $INFINITY = 0x7fffffff;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9448
 http://sourceforge.net/p/phpwiki/code/9448
Author: vargenau
Date: 2014年12月18日 17:08:11 +0000 (2014年12月18日)
Log Message:
-----------
Add public/protected/private
Modified Paths:
--------------
 trunk/lib/loadsave.php
 trunk/lib/stdlib.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2014年12月17日 14:35:04 UTC (rev 9447)
+++ trunk/lib/loadsave.php	2014年12月18日 17:08:11 UTC (rev 9448)
@@ -1327,10 +1327,10 @@
 $this->_includefiles = $_include;
 $this->_exclude = $exclude;
 $this->_skiplist = array();
- parent::FileSet($dirname);
+ parent::__construct($dirname);
 }
 
- function _filenameSelector($fn)
+ protected function _filenameSelector($fn)
 {
 $incl = &$this->_includefiles;
 $excl = &$this->_exclude;
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014年12月17日 14:35:04 UTC (rev 9447)
+++ trunk/lib/stdlib.php	2014年12月18日 17:08:11 UTC (rev 9448)
@@ -657,20 +657,20 @@
 
 class Stack
 {
- function Stack()
+ function __construct()
 {
 $this->items = array();
 $this->size = 0;
 }
 
- function push($item)
+ public function push($item)
 {
 $this->items[$this->size] = $item;
 $this->size++;
 return true;
 }
 
- function pop()
+ public function pop()
 {
 if ($this->size == 0) {
 return false; // stack is empty
@@ -679,12 +679,12 @@
 return $this->items[$this->size];
 }
 
- function cnt()
+ public function cnt()
 {
 return $this->size;
 }
 
- function top()
+ public function top()
 {
 if ($this->size)
 return $this->items[$this->size - 1];
@@ -768,9 +768,7 @@
 return $WikiTheme->linkBadWikiWord($wikipage, $url);
 }
 
- return HTML::a(array('href' => WikiURL($pagename, $args),
- 'class' => $class),
- $text);
+ return HTML::a(array('href' => WikiURL($pagename, $args), 'class' => $class), $text);
 }
 
 /**
@@ -890,7 +888,7 @@
 $this->shortName, join(', ', $warnings));
 }
 
- function _pagename($page)
+ private function _pagename($page)
 {
 if (is_a($page, 'WikiDB_Page'))
 return $page->getName();
@@ -901,7 +899,7 @@
 return $page;
 }
 
- function _normalize_bad_pagename($name)
+ private function _normalize_bad_pagename($name)
 {
 trigger_error("Bad pagename: " . $name, E_USER_WARNING);
 
@@ -922,7 +920,7 @@
 * which cannot be deleted anymore, because unknown chars are compressed.
 * So BEFORE importing a file _check must be done !!!
 */
- function _check($pagename)
+ private function _check($pagename)
 {
 // Compress internal white-space to single space character.
 $pagename = preg_replace('/[\s\xa0]+/', ' ', $orig = $pagename);
@@ -972,7 +970,7 @@
 * Converts all tabs to (the appropriate number of) spaces.
 *
 * @param string $str
- * @param integer $tab_width
+ * @param int $tab_width
 * @return string
 */
 function expand_tabs($str, $tab_width = 8)
@@ -1338,7 +1336,7 @@
 
 class fileSet
 {
- function fileSet($directory, $filepattern = false)
+ function __construct($directory, $filepattern = false)
 {
 $this->_fileList = array();
 $this->_pattern = $filepattern;
@@ -1374,7 +1372,7 @@
 * (This was a function LoadDir in lib/loadsave.php)
 * See also http://www.php.net/manual/en/function.readdir.php
 */
- function getFiles($exclude = '', $sortby = '', $limit = '')
+ public function getFiles($exclude = '', $sortby = '', $limit = '')
 {
 $list = $this->_fileList;
 
@@ -1400,7 +1398,7 @@
 return $list;
 }
 
- function _filenameSelector($filename)
+ protected function _filenameSelector($filename)
 {
 if (!$this->_pattern)
 return true;
@@ -1419,7 +1417,7 @@
 * A file is considered an image when the suffix matches one from
 * INLINE_IMAGES.
 */
- function _filenameSelector($filename)
+ protected function _filenameSelector($filename)
 {
 return is_image($filename);
 }
@@ -1427,7 +1425,7 @@
 
 class imageOrVideoSet extends fileSet
 {
- function _filenameSelector($filename)
+ protected function _filenameSelector($filename)
 {
 return is_image($filename) or is_video($filename);
 }
@@ -1638,7 +1636,7 @@
 /**
 * Show the alert box.
 */
- function show()
+ public function show()
 {
 global $request;
 
@@ -1651,7 +1649,7 @@
 $request->finish();
 }
 
- function _getButtons()
+ private function _getButtons()
 {
 global $request;
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9447
 http://sourceforge.net/p/phpwiki/code/9447
Author: vargenau
Date: 2014年12月17日 14:35:04 +0000 (2014年12月17日)
Log Message:
-----------
Remove EMailConfirm (unused)
Modified Paths:
--------------
 trunk/locale/Makefile
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2014年12月17日 14:33:42 UTC (rev 9446)
+++ trunk/locale/Makefile	2014年12月17日 14:35:04 UTC (rev 9447)
@@ -315,7 +315,6 @@
 ${POT_FILE}: ../lib/WikiUser/AdoDb.php
 ${POT_FILE}: ../lib/WikiUser/BogoLogin.php
 ${POT_FILE}: ../lib/WikiUser/Db.php
-${POT_FILE}: ../lib/WikiUser/EMailConfirm.php
 ${POT_FILE}: ../lib/WikiUser/Facebook.php
 ${POT_FILE}: ../lib/WikiUser/File.php
 ${POT_FILE}: ../lib/WikiUser/Forbidden.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9446
 http://sourceforge.net/p/phpwiki/code/9446
Author: vargenau
Date: 2014年12月17日 14:33:42 +0000 (2014年12月17日)
Log Message:
-----------
Remove EMailConfirm (unused)
Modified Paths:
--------------
 trunk/TODO
 trunk/lib/MailNotify.php
Removed Paths:
-------------
 trunk/lib/WikiUser/EMailConfirm.php
Modified: trunk/TODO
===================================================================
--- trunk/TODO	2014年12月17日 14:25:01 UTC (rev 9445)
+++ trunk/TODO	2014年12月17日 14:33:42 UTC (rev 9446)
@@ -38,7 +38,6 @@
 * ATOM (experimentally done), TrackBack, PingBack services (take it from DokuWiki)
 * finish Blog theme
 * lang: mapping
-* WikiUser/EMailConfirm (?)
 * ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl
 * WikiUser/OpenID (from DokuWiki) - Status::in_work
 * more meta stuff: OpenSearch, format=dc (Dublin Core)
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2014年12月17日 14:25:01 UTC (rev 9445)
+++ trunk/lib/MailNotify.php	2014年12月17日 14:33:42 UTC (rev 9446)
@@ -31,7 +31,6 @@
 * [Watch] WatchPage - add a page, or delete watch handlers into the users
 * pref[notifyPages] slot.
 * My WatchList - view or edit list/regex of pref[notifyPages].
- * EMailConfirm methods: send and verify
 *
 * Helper functions:
 * getPageChangeEmails
Deleted: trunk/lib/WikiUser/EMailConfirm.php
===================================================================
--- trunk/lib/WikiUser/EMailConfirm.php	2014年12月17日 14:25:01 UTC (rev 9445)
+++ trunk/lib/WikiUser/EMailConfirm.php	2014年12月17日 14:33:42 UTC (rev 9446)
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * Copyright (C) 2006 ReiniUrban
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-class _EMailConfirmPassUser
- extends _PassUser
- /**
- * Unconfirmed users have ANON access,
- * confirmed users are equal to passusers WIKIAUTH_USER.
- *
- * Users give their email at registration, phpwiki sends a link per email,
- * user clicks on url link to verify, user is confirmed.
- *
- * Preferences are handled in _PassUser
- */
-{
- // This can only be called from _PassUser, because the parent class
- // sets the pref methods, before this class is initialized.
- function _EMailConfirmPassUser($UserName = '', $prefs = false, $file = '')
- {
- if (!$this->_prefs and is_a($this, "_EMailPassUser")) {
- if ($prefs) $this->_prefs = $prefs;
- if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
- }
- $this->_userid = $UserName;
- return $this;
- }
-
- function userExists()
- {
- if (!$this->isValidName($this->_userid)) {
- return $this->_tryNextUser();
- }
- $this->_authmethod = 'EMailConfirm';
- // check the prefs for emailVerified
- if ($this->_prefs->get('emailVerified'))
- return true;
- return $this->_tryNextUser();
- }
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9445
 http://sourceforge.net/p/phpwiki/code/9445
Author: vargenau
Date: 2014年12月17日 14:25:01 +0000 (2014年12月17日)
Log Message:
-----------
Remove unused
Modified Paths:
--------------
 trunk/lib/Template.php
 trunk/lib/WikiDB/backend/ADODB.php
 trunk/lib/WikiDB/backend/PDO.php
 trunk/lib/WikiPlugin.php
 trunk/lib/WikiUser.php
 trunk/lib/display.php
 trunk/lib/pdf.php
 trunk/lib/plugin/ModeratedPage.php
 trunk/lib/stdlib.php
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2014年12月17日 14:23:56 UTC (rev 9444)
+++ trunk/lib/Template.php	2014年12月17日 14:25:01 UTC (rev 9445)
@@ -288,7 +288,7 @@
 if (!isset($args['HEADER']))
 $args['HEADER'] = SplitPagename($title);
 
- global $HIDE_TOOLBARS, $NO_BASEHREF, $WikiTheme;
+ global $HIDE_TOOLBARS, $WikiTheme;
 $HIDE_TOOLBARS = true;
 if (!$WikiTheme->DUMP_MODE)
 $WikiTheme->DUMP_MODE = 'HTML';
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2014年12月17日 14:23:56 UTC (rev 9444)
+++ trunk/lib/WikiDB/backend/ADODB.php	2014年12月17日 14:25:01 UTC (rev 9445)
@@ -280,7 +280,7 @@
 $dbh = &$this->_dbh;
 $page_tbl = $this->_table_names['page_tbl'];
 if (empty($data)) $data = '';
- $rs = $dbh->Execute("UPDATE $page_tbl"
+ $dbh->Execute("UPDATE $page_tbl"
 . " SET cached_html=?"
 . " WHERE pagename=?",
 array($data, $pagename));
@@ -1366,7 +1366,6 @@
 function next()
 {
 $result = &$this->_result;
- $backend = &$this->_backend;
 if (!$result || $result->EOF) {
 $this->free();
 return false;
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2014年12月17日 14:23:56 UTC (rev 9444)
+++ trunk/lib/WikiDB/backend/PDO.php	2014年12月17日 14:25:01 UTC (rev 9445)
@@ -1321,7 +1321,6 @@
 
 function write_accesslog(&$entry)
 {
- global $request;
 $dbh = &$this->_dbh;
 $log_tbl = $entry->_accesslog->logtable;
 $dbh->prepare("INSERT INTO $log_tbl"
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2014年12月17日 14:23:56 UTC (rev 9444)
+++ trunk/lib/WikiPlugin.php	2014年12月17日 14:25:01 UTC (rev 9445)
@@ -322,7 +322,6 @@
 'class' => $args['class'],
 'accept-charset' => 'UTF-8'));
 if (!USE_PATH_INFO) {
- $pagename = $request->get('pagename');
 $form->pushContent(HTML::input(array('type' => 'hidden',
 'name' => 'pagename',
 'value' => $args['targetpage'])));
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014年12月17日 14:23:56 UTC (rev 9444)
+++ trunk/lib/WikiUser.php	2014年12月17日 14:25:01 UTC (rev 9445)
@@ -1254,7 +1254,7 @@
 while ($user and $user->_userid) {
 $user = UpgradeUser($this, $user);
 if ($user->userExists()) {
- $user = UpgradeUser($this, $user);
+ UpgradeUser($this, $user);
 return true;
 }
 // prevent endless loop. does this work on all PHP's?
@@ -1405,7 +1405,7 @@
 while ($user = new $class($this->_userid, $this->_prefs)) {
 $user = UpgradeUser($this, $user);
 if ($user->userExists()) {
- $user = UpgradeUser($this, $user);
+ UpgradeUser($this, $user);
 return true;
 }
 if ($class == "_ForbiddenPassUser") return false;
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2014年12月17日 14:23:56 UTC (rev 9444)
+++ trunk/lib/display.php	2014年12月17日 14:25:01 UTC (rev 9445)
@@ -157,7 +157,7 @@
 if ($format == 'pdf') {
 require_once 'lib/pdf.php';
 array_unshift($args['VALID_LINKS'], $pagename);
- ConvertAndDisplayPdfPageList($request, $pagelist, $args);
+ ConvertAndDisplayPdfPageList($request, $pagelist);
 } elseif ($format == 'ziphtml') { // need to fix links
 require_once 'lib/loadsave.php';
 array_unshift($args['VALID_LINKS'], $pagename);
Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php	2014年12月17日 14:23:56 UTC (rev 9444)
+++ trunk/lib/pdf.php	2014年12月17日 14:25:01 UTC (rev 9445)
@@ -28,13 +28,12 @@
 * htmldoc or ghostscript + html2ps or docbook (dbdoclet, xsltproc, fop)
 * http://www.easysw.com/htmldoc
 */
-function ConvertAndDisplayPdfPageList(&$request, $pagelist, $args = array())
+function ConvertAndDisplayPdfPageList(&$request, $pagelist)
 {
 global $WikiTheme;
 if (empty($request->_is_buffering_output))
 $request->buffer_output(false /*'nocompress'*/);
 $pagename = $request->getArg('pagename');
- $dest = $request->getArg('dest');
 $request->setArg('dest', false);
 $request->setArg('format', false);
 include_once 'lib/display.php';
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2014年12月17日 14:23:56 UTC (rev 9444)
+++ trunk/lib/plugin/ModeratedPage.php	2014年12月17日 14:25:01 UTC (rev 9445)
@@ -304,8 +304,6 @@
 $this->cleanup_and_notify($request, $args, $moderation);
 // start from scratch, dispatch the action as in lib/main to the action handler
 $request->discardOutput();
- $oldargs = $request->args;
- $olduser = $request->_user;
 $request->args = $moderation['args'];
 $request->_user->_userid = $moderation['userid']; // keep current perms but fake the id.
 // TODO: fake author ip also
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014年12月17日 14:23:56 UTC (rev 9444)
+++ trunk/lib/stdlib.php	2014年12月17日 14:25:01 UTC (rev 9445)
@@ -2019,8 +2019,6 @@
 if (empty($line)) return $options;
 
 // First we have an attribute name.
- $attribute = "";
- $value = "";
 
 $i = 0;
 while (($i < strlen($line)) && ($line[$i] != '=')) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9444
 http://sourceforge.net/p/phpwiki/code/9444
Author: vargenau
Date: 2014年12月17日 14:23:56 +0000 (2014年12月17日)
Log Message:
-----------
Add $this
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/cvs.php
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php	2014年12月16日 13:44:44 UTC (rev 9443)
+++ trunk/lib/WikiDB/backend/cvs.php	2014年12月17日 14:23:56 UTC (rev 9444)
@@ -961,16 +961,16 @@
 $documentDir = ".")
 {
 $this->Cvs_Backend_Array_Iterator($arrayValue);
- $_searchString = $searchString;
- $_docDir = $documentDir;
+ $this->_searchString = $searchString;
+ $this->_docDir = $documentDir;
 }
 
 function next()
 {
 do {
 $pageName = Cvs_Backend_Array_Iterator::next();
- } while (!$this->_searchFile($_searchString,
- $_docDir . "/" . $pageName));
+ } while (!$this->_searchFile($this->_searchString,
+ $this->_docDir . "/" . $pageName));
 
 return $pageName;
 }
@@ -1006,7 +1006,7 @@
 $searchString = "")
 {
 parent::__construct($arrayValue);
- $_searchString = $searchString;
+ $this->_searchString = $searchString;
 }
 
 function next()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9443
 http://sourceforge.net/p/phpwiki/code/9443
Author: vargenau
Date: 2014年12月16日 13:44:44 +0000 (2014年12月16日)
Log Message:
-----------
Add Composer and Twig
Added Paths:
-----------
 trunk/composer.json
 trunk/composer.lock
 trunk/vendor/
 trunk/vendor/autoload.php
 trunk/vendor/bin/
 trunk/vendor/bin/composer
 trunk/vendor/composer/
 trunk/vendor/composer/ClassLoader.php
 trunk/vendor/composer/autoload_classmap.php
 trunk/vendor/composer/autoload_namespaces.php
 trunk/vendor/composer/autoload_psr4.php
 trunk/vendor/composer/autoload_real.php
 trunk/vendor/composer/installed.json
 trunk/vendor/twig/
 trunk/vendor/twig/twig/
 trunk/vendor/twig/twig/.editorconfig
 trunk/vendor/twig/twig/.gitignore
 trunk/vendor/twig/twig/.travis.yml
 trunk/vendor/twig/twig/CHANGELOG
 trunk/vendor/twig/twig/LICENSE
 trunk/vendor/twig/twig/README.rst
 trunk/vendor/twig/twig/composer.json
 trunk/vendor/twig/twig/doc/
 trunk/vendor/twig/twig/doc/advanced.rst
 trunk/vendor/twig/twig/doc/advanced_legacy.rst
 trunk/vendor/twig/twig/doc/api.rst
 trunk/vendor/twig/twig/doc/coding_standards.rst
 trunk/vendor/twig/twig/doc/deprecated.rst
 trunk/vendor/twig/twig/doc/filters/
 trunk/vendor/twig/twig/doc/filters/abs.rst
 trunk/vendor/twig/twig/doc/filters/batch.rst
 trunk/vendor/twig/twig/doc/filters/capitalize.rst
 trunk/vendor/twig/twig/doc/filters/convert_encoding.rst
 trunk/vendor/twig/twig/doc/filters/date.rst
 trunk/vendor/twig/twig/doc/filters/date_modify.rst
 trunk/vendor/twig/twig/doc/filters/default.rst
 trunk/vendor/twig/twig/doc/filters/escape.rst
 trunk/vendor/twig/twig/doc/filters/first.rst
 trunk/vendor/twig/twig/doc/filters/format.rst
 trunk/vendor/twig/twig/doc/filters/index.rst
 trunk/vendor/twig/twig/doc/filters/join.rst
 trunk/vendor/twig/twig/doc/filters/json_encode.rst
 trunk/vendor/twig/twig/doc/filters/keys.rst
 trunk/vendor/twig/twig/doc/filters/last.rst
 trunk/vendor/twig/twig/doc/filters/length.rst
 trunk/vendor/twig/twig/doc/filters/lower.rst
 trunk/vendor/twig/twig/doc/filters/merge.rst
 trunk/vendor/twig/twig/doc/filters/nl2br.rst
 trunk/vendor/twig/twig/doc/filters/number_format.rst
 trunk/vendor/twig/twig/doc/filters/raw.rst
 trunk/vendor/twig/twig/doc/filters/replace.rst
 trunk/vendor/twig/twig/doc/filters/reverse.rst
 trunk/vendor/twig/twig/doc/filters/round.rst
 trunk/vendor/twig/twig/doc/filters/slice.rst
 trunk/vendor/twig/twig/doc/filters/sort.rst
 trunk/vendor/twig/twig/doc/filters/split.rst
 trunk/vendor/twig/twig/doc/filters/striptags.rst
 trunk/vendor/twig/twig/doc/filters/title.rst
 trunk/vendor/twig/twig/doc/filters/trim.rst
 trunk/vendor/twig/twig/doc/filters/upper.rst
 trunk/vendor/twig/twig/doc/filters/url_encode.rst
 trunk/vendor/twig/twig/doc/functions/
 trunk/vendor/twig/twig/doc/functions/attribute.rst
 trunk/vendor/twig/twig/doc/functions/block.rst
 trunk/vendor/twig/twig/doc/functions/constant.rst
 trunk/vendor/twig/twig/doc/functions/cycle.rst
 trunk/vendor/twig/twig/doc/functions/date.rst
 trunk/vendor/twig/twig/doc/functions/dump.rst
 trunk/vendor/twig/twig/doc/functions/include.rst
 trunk/vendor/twig/twig/doc/functions/index.rst
 trunk/vendor/twig/twig/doc/functions/max.rst
 trunk/vendor/twig/twig/doc/functions/min.rst
 trunk/vendor/twig/twig/doc/functions/parent.rst
 trunk/vendor/twig/twig/doc/functions/random.rst
 trunk/vendor/twig/twig/doc/functions/range.rst
 trunk/vendor/twig/twig/doc/functions/source.rst
 trunk/vendor/twig/twig/doc/functions/template_from_string.rst
 trunk/vendor/twig/twig/doc/index.rst
 trunk/vendor/twig/twig/doc/installation.rst
 trunk/vendor/twig/twig/doc/internals.rst
 trunk/vendor/twig/twig/doc/intro.rst
 trunk/vendor/twig/twig/doc/recipes.rst
 trunk/vendor/twig/twig/doc/tags/
 trunk/vendor/twig/twig/doc/tags/autoescape.rst
 trunk/vendor/twig/twig/doc/tags/block.rst
 trunk/vendor/twig/twig/doc/tags/do.rst
 trunk/vendor/twig/twig/doc/tags/embed.rst
 trunk/vendor/twig/twig/doc/tags/extends.rst
 trunk/vendor/twig/twig/doc/tags/filter.rst
 trunk/vendor/twig/twig/doc/tags/flush.rst
 trunk/vendor/twig/twig/doc/tags/for.rst
 trunk/vendor/twig/twig/doc/tags/from.rst
 trunk/vendor/twig/twig/doc/tags/if.rst
 trunk/vendor/twig/twig/doc/tags/import.rst
 trunk/vendor/twig/twig/doc/tags/include.rst
 trunk/vendor/twig/twig/doc/tags/index.rst
 trunk/vendor/twig/twig/doc/tags/macro.rst
 trunk/vendor/twig/twig/doc/tags/sandbox.rst
 trunk/vendor/twig/twig/doc/tags/set.rst
 trunk/vendor/twig/twig/doc/tags/spaceless.rst
 trunk/vendor/twig/twig/doc/tags/use.rst
 trunk/vendor/twig/twig/doc/tags/verbatim.rst
 trunk/vendor/twig/twig/doc/templates.rst
 trunk/vendor/twig/twig/doc/tests/
 trunk/vendor/twig/twig/doc/tests/constant.rst
 trunk/vendor/twig/twig/doc/tests/defined.rst
 trunk/vendor/twig/twig/doc/tests/divisibleby.rst
 trunk/vendor/twig/twig/doc/tests/empty.rst
 trunk/vendor/twig/twig/doc/tests/even.rst
 trunk/vendor/twig/twig/doc/tests/index.rst
 trunk/vendor/twig/twig/doc/tests/iterable.rst
 trunk/vendor/twig/twig/doc/tests/null.rst
 trunk/vendor/twig/twig/doc/tests/odd.rst
 trunk/vendor/twig/twig/doc/tests/sameas.rst
 trunk/vendor/twig/twig/ext/
 trunk/vendor/twig/twig/ext/twig/
 trunk/vendor/twig/twig/ext/twig/.gitignore
 trunk/vendor/twig/twig/ext/twig/config.m4
 trunk/vendor/twig/twig/ext/twig/config.w32
 trunk/vendor/twig/twig/ext/twig/php_twig.h
 trunk/vendor/twig/twig/ext/twig/twig.c
 trunk/vendor/twig/twig/lib/
 trunk/vendor/twig/twig/lib/Twig/
 trunk/vendor/twig/twig/lib/Twig/Autoloader.php
 trunk/vendor/twig/twig/lib/Twig/Compiler.php
 trunk/vendor/twig/twig/lib/Twig/CompilerInterface.php
 trunk/vendor/twig/twig/lib/Twig/Environment.php
 trunk/vendor/twig/twig/lib/Twig/Error/
 trunk/vendor/twig/twig/lib/Twig/Error/Loader.php
 trunk/vendor/twig/twig/lib/Twig/Error/Runtime.php
 trunk/vendor/twig/twig/lib/Twig/Error/Syntax.php
 trunk/vendor/twig/twig/lib/Twig/Error.php
 trunk/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
 trunk/vendor/twig/twig/lib/Twig/ExpressionParser.php
 trunk/vendor/twig/twig/lib/Twig/Extension/
 trunk/vendor/twig/twig/lib/Twig/Extension/Core.php
 trunk/vendor/twig/twig/lib/Twig/Extension/Debug.php
 trunk/vendor/twig/twig/lib/Twig/Extension/Escaper.php
 trunk/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
 trunk/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
 trunk/vendor/twig/twig/lib/Twig/Extension/Staging.php
 trunk/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
 trunk/vendor/twig/twig/lib/Twig/Extension.php
 trunk/vendor/twig/twig/lib/Twig/ExtensionInterface.php
 trunk/vendor/twig/twig/lib/Twig/Filter/
 trunk/vendor/twig/twig/lib/Twig/Filter/Function.php
 trunk/vendor/twig/twig/lib/Twig/Filter/Method.php
 trunk/vendor/twig/twig/lib/Twig/Filter/Node.php
 trunk/vendor/twig/twig/lib/Twig/Filter.php
 trunk/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
 trunk/vendor/twig/twig/lib/Twig/FilterInterface.php
 trunk/vendor/twig/twig/lib/Twig/Function/
 trunk/vendor/twig/twig/lib/Twig/Function/Function.php
 trunk/vendor/twig/twig/lib/Twig/Function/Method.php
 trunk/vendor/twig/twig/lib/Twig/Function/Node.php
 trunk/vendor/twig/twig/lib/Twig/Function.php
 trunk/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
 trunk/vendor/twig/twig/lib/Twig/FunctionInterface.php
 trunk/vendor/twig/twig/lib/Twig/Lexer.php
 trunk/vendor/twig/twig/lib/Twig/LexerInterface.php
 trunk/vendor/twig/twig/lib/Twig/Loader/
 trunk/vendor/twig/twig/lib/Twig/Loader/Array.php
 trunk/vendor/twig/twig/lib/Twig/Loader/Chain.php
 trunk/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
 trunk/vendor/twig/twig/lib/Twig/Loader/String.php
 trunk/vendor/twig/twig/lib/Twig/LoaderInterface.php
 trunk/vendor/twig/twig/lib/Twig/Markup.php
 trunk/vendor/twig/twig/lib/Twig/Node/
 trunk/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
 trunk/vendor/twig/twig/lib/Twig/Node/Block.php
 trunk/vendor/twig/twig/lib/Twig/Node/BlockReference.php
 trunk/vendor/twig/twig/lib/Twig/Node/Body.php
 trunk/vendor/twig/twig/lib/Twig/Node/Do.php
 trunk/vendor/twig/twig/lib/Twig/Node/Embed.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Filter/
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
 trunk/vendor/twig/twig/lib/Twig/Node/Expression.php
 trunk/vendor/twig/twig/lib/Twig/Node/Flush.php
 trunk/vendor/twig/twig/lib/Twig/Node/For.php
 trunk/vendor/twig/twig/lib/Twig/Node/ForLoop.php
 trunk/vendor/twig/twig/lib/Twig/Node/If.php
 trunk/vendor/twig/twig/lib/Twig/Node/Import.php
 trunk/vendor/twig/twig/lib/Twig/Node/Include.php
 trunk/vendor/twig/twig/lib/Twig/Node/Macro.php
 trunk/vendor/twig/twig/lib/Twig/Node/Module.php
 trunk/vendor/twig/twig/lib/Twig/Node/Print.php
 trunk/vendor/twig/twig/lib/Twig/Node/Sandbox.php
 trunk/vendor/twig/twig/lib/Twig/Node/SandboxedModule.php
 trunk/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
 trunk/vendor/twig/twig/lib/Twig/Node/Set.php
 trunk/vendor/twig/twig/lib/Twig/Node/SetTemp.php
 trunk/vendor/twig/twig/lib/Twig/Node/Spaceless.php
 trunk/vendor/twig/twig/lib/Twig/Node/Text.php
 trunk/vendor/twig/twig/lib/Twig/Node.php
 trunk/vendor/twig/twig/lib/Twig/NodeInterface.php
 trunk/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
 trunk/vendor/twig/twig/lib/Twig/NodeTraverser.php
 trunk/vendor/twig/twig/lib/Twig/NodeVisitor/
 trunk/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
 trunk/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
 trunk/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
 trunk/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
 trunk/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
 trunk/vendor/twig/twig/lib/Twig/Parser.php
 trunk/vendor/twig/twig/lib/Twig/ParserInterface.php
 trunk/vendor/twig/twig/lib/Twig/Sandbox/
 trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
 trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
 trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
 trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
 trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
 trunk/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
 trunk/vendor/twig/twig/lib/Twig/SimpleFilter.php
 trunk/vendor/twig/twig/lib/Twig/SimpleFunction.php
 trunk/vendor/twig/twig/lib/Twig/SimpleTest.php
 trunk/vendor/twig/twig/lib/Twig/Template.php
 trunk/vendor/twig/twig/lib/Twig/TemplateInterface.php
 trunk/vendor/twig/twig/lib/Twig/Test/
 trunk/vendor/twig/twig/lib/Twig/Test/Function.php
 trunk/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
 trunk/vendor/twig/twig/lib/Twig/Test/Method.php
 trunk/vendor/twig/twig/lib/Twig/Test/Node.php
 trunk/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
 trunk/vendor/twig/twig/lib/Twig/Test.php
 trunk/vendor/twig/twig/lib/Twig/TestCallableInterface.php
 trunk/vendor/twig/twig/lib/Twig/TestInterface.php
 trunk/vendor/twig/twig/lib/Twig/Token.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/
 trunk/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Block.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Do.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/For.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/From.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/If.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Import.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Include.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Set.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser/Use.php
 trunk/vendor/twig/twig/lib/Twig/TokenParser.php
 trunk/vendor/twig/twig/lib/Twig/TokenParserBroker.php
 trunk/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
 trunk/vendor/twig/twig/lib/Twig/TokenParserInterface.php
 trunk/vendor/twig/twig/lib/Twig/TokenStream.php
 trunk/vendor/twig/twig/phpunit.xml.dist
 trunk/vendor/twig/twig/test/
 trunk/vendor/twig/twig/test/Twig/
 trunk/vendor/twig/twig/test/Twig/Tests/
 trunk/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/CompilerTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/ErrorTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Extension/
 trunk/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/base.html
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/index.html
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/unclosed_tag.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_trait.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array_call.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/binary.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/bitwise.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/comparison.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/divisibleby.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ends_with.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/grouping.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/magic_call.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/matches.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/method_call.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/postfix.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/sameas.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/starts_with.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/strings.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_precedence.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/abs.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_float.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_fill.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/convert_encoding.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format_interval.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_immutable.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_interval.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_modify.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_namedargs.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/default.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/dynamic_filter.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_html_attr.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/first.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/force_escape.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/format.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/join.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/json_encode.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/last.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length_utf8.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/merge.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/nl2br.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format_default.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/reverse.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/round.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/slice.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/sort.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/special_chars.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split_utf8.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/trim.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/attribute.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/constant.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/cycle.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date_namedargs.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump_array.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dynamic_function.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/assignment.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/autoescaping.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/expression.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing_nested.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/template_instance.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_context.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_variables.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/max.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/min.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/range.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/source.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/special_chars.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/template_from_string.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/default_values.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/nested_calls.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/reserved_variables.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/simple.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/with_filters.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/combined_debug_info.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/empty_token.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/issue_1143.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/multi_word_tests.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/simple_xml_element.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/functions.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/literal.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/nested.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/objects.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/raw.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/type.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/special_chars.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/error_line.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/multiple.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/json_encode.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/multiple.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/nested.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/condition.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/context.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/else.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/inner_variables.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/nested_else.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects_countable.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/recursive.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/values.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/from.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/expression.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/expression.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing_nested.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/only.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/template_instance.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/with_variables.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr2.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/empty.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_in_a_block.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/use.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/external.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/global.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/self_import.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/special_chars.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/super_globals.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid1.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid2.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/simple.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture-empty.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/expression.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/simple.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/special_chars.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/aliases.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep_empty.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance2.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block2.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block3.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/basic.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/array.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/constant.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/empty.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/even.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in_with_objects.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/iterable.test
 trunk/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/odd.test
 trunk/vendor/twig/twig/test/Twig/Tests/IntegrationTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/LexerTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/index.html
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/index.html
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/index.html
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/index.html
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/index.html
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/index.html
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/index.html
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/index.html
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/blocks.html.twig
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/
 trunk/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/blocks.html.twig
 trunk/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/
 trunk/vendor/twig/twig/test/Twig/Tests/Node/AutoEscapeTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/BlockReferenceTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/BlockTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/DoTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ArrayTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/AssignNameTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AddTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AndTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ConcatTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/DivTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/FloorDivTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ModTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/MulTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/OrTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/SubTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConditionalTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConstantTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/FilterTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/FunctionTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/GetAttrTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/NameTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/ParentTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/TestTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NegTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NotTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/PosTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/ForTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/IfTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/ImportTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/MacroTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/ModuleTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/PrintTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/SandboxTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/SandboxedModuleTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/SandboxedPrintTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/SetTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/SpacelessTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/Node/TextTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/NodeVisitor/
 trunk/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/ParserTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/TemplateTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
 trunk/vendor/twig/twig/test/Twig/Tests/escapingTest.php
 trunk/vendor/twig/twig/test/bootstrap.php
Added: trunk/composer.json
===================================================================
--- trunk/composer.json	 (rev 0)
+++ trunk/composer.json	2014年12月16日 13:44:44 UTC (rev 9443)
@@ -0,0 +1,5 @@
+{
+ "require": {
+ "twig/twig": "~1.0"
+ }
+}
Added: trunk/composer.lock
===================================================================
--- trunk/composer.lock	 (rev 0)
+++ trunk/composer.lock	2014年12月16日 13:44:44 UTC (rev 9443)
@@ -0,0 +1,75 @@
+{
+ "_readme": [
+ "This file locks the dependencies of your project to a known state",
+ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "This file is @generated automatically"
+ ],
+ "hash": "a31e651ea26a527432562441b3545e0a",
+ "packages": [
+ {
+ "name": "twig/twig",
+ "version": "v1.16.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/twigphp/Twig.git",
+ "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
+ "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.2.4"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.16-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Twig_": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fa...@sy...",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Armin Ronacher",
+ "email": "arm...@ac...",
+ "role": "Project Founder"
+ },
+ {
+ "name": "Twig Team",
+ "homepage": "https://github.com/fabpot/Twig/graphs/contributors",
+ "role": "Contributors"
+ }
+ ],
+ "description": "Twig, the flexible, fast, and secure template language for PHP",
+ "homepage": "http://twig.sensiolabs.org",
+ "keywords": [
+ "templating"
+ ],
+ "time": "2014-10-17 12:53:44"
+ }
+ ],
+ "packages-dev": [],
+ "aliases": [],
+ "minimum-stability": "stable",
+ "stability-flags": [],
+ "prefer-stable": false,
+ "prefer-lowest": false,
+ "platform": [],
+ "platform-dev": []
+}
Added: trunk/vendor/autoload.php
===================================================================
--- trunk/vendor/autoload.php	 (rev 0)
+++ trunk/vendor/autoload.php	2014年12月16日 13:44:44 UTC (rev 9443)
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInitac3ac6a53c444c96c86cc3afe46d2f91::getLoader();
Added: trunk/vendor/bin/composer
===================================================================
(Binary files differ)
Index: trunk/vendor/bin/composer
===================================================================
--- trunk/vendor/bin/composer	2014年12月11日 18:00:59 UTC (rev 9442)
+++ trunk/vendor/bin/composer	2014年12月16日 13:44:44 UTC (rev 9443)
Property changes on: trunk/vendor/bin/composer
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/vendor/composer/ClassLoader.php
===================================================================
--- trunk/vendor/composer/ClassLoader.php	 (rev 0)
+++ trunk/vendor/composer/ClassLoader.php	2014年12月16日 13:44:44 UTC (rev 9443)
@@ -0,0 +1,387 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <nad...@na...>
+ * Jordi Boggiano <j.b...@se...>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0 class loader
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ *
+ * $loader = new \Composer\Autoload\ClassLoader();
+ *
+ * // register classes with namespaces
+ * $loader->add('Symfony\Component', __DIR__.'/component');
+ * $loader->add('Symfony', __DIR__.'/framework');
+ *
+ * // activate the autoloader
+ * $loader->register();
+ *
+ * // to enable searching the include path (eg. for PEAR packages)
+ * $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fa...@sy...>
+ * @author Jordi Boggiano <j.b...@se...>
+ */
+class ClassLoader
+{
+ // PSR-4
+ private $prefixLengthsPsr4 = array();
+ private $prefixDirsPsr4 = array();
+ private $fallbackDirsPsr4 = array();
+
+ // PSR-0
+ private $prefixesPsr0 = array();
+ private $fallbackDirsPsr0 = array();
+
+ private $useIncludePath = false;
+ private $classMap = array();
+
+ public function getPrefixes()
+ {
+ if (!empty($this->prefixesPsr0)) {
+ return call_user_func_array('array_merge', $this->prefixesPsr0);
+ }
+
+ return array();
+ }
+
+ public function getPrefixesPsr4()
+ {
+ return $this->prefixDirsPsr4;
+ }
+
+ public function getFallbackDirs()
+ {
+ return $this->fallbackDirsPsr0;
+ }
+
+ public function getFallbackDirsPsr4()
+ {
+ return $this->fallbackDirsPsr4;
+ }
+
+ public function getClassMap()
+ {
+ return $this->classMap;
+ }
+
+ /**
+ * @param array $classMap Class to filename map
+ */
+ public function addClassMap(array $classMap)
+ {
+ if ($this->classMap) {
+ $this->classMap = array_merge($this->classMap, $classMap);
+ } else {
+ $this->classMap = $classMap;
+ }
+ }
+
+ /**
+ * Registers a set of PSR-0 directories for a given prefix, either
+ * appending or prepending to the ones previously set for this prefix.
+ *
+ * @param string $prefix The prefix
+ * @param array|string $paths The PSR-0 root directories
+ * @param bool $prepend Whether to prepend the directories
+ */
+ public function add($prefix, $paths, $prepend = false)
+ {
+ if (!$prefix) {
+ if ($prepend) {
+ $this->fallbackDirsPsr0 = array_merge(
+ (array) $paths,
+ $this->fallbackDirsPsr0
+ );
+ } else {
+ $this->fallbackDirsPsr0 = array_merge(
+ $this->fallbackDirsPsr0,
+ (array) $paths
+ );
+ }
+
+ return;
+ }
+
+ $first = $prefix[0];
+ if (!isset($this->prefixesPsr0[$first][$prefix])) {
+ $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+ return;
+ }
+ if ($prepend) {
+ $this->prefixesPsr0[$first][$prefix] = array_merge(
+ (array) $paths,
+ $this->prefixesPsr0[$first][$prefix]
+ );
+ } else {
+ $this->prefixesPsr0[$first][$prefix] = array_merge(
+ $this->prefixesPsr0[$first][$prefix],
+ (array) $paths
+ );
+ }
+ }
+
+ /**
+ * Registers a set of PSR-4 directories for a given namespace, either
+ * appending or prepending to the ones previously set for this namespace.
+ *
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param array|string $paths The PSR-0 base directories
+ * @param bool $prepend Whether to prepend the directories
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function addPsr4($prefix, $paths, $prepend = false)
+ {
+ if (!$prefix) {
+ // Register directories for the root namespace.
+ if ($prepend) {
+ $this->fallbackDirsPsr4 = array_merge(
+ (array) $paths,
+ $this->fallbackDirsPsr4
+ );
+ } else {
+ $this->fallbackDirsPsr4 = array_merge(
+ $this->fallbackDirsPsr4,
+ (array) $paths
+ );
+ }
+ } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+ // Register directories for a new namespace.
+ $length = strlen($prefix);
+ if ('\\' !== $prefix[$length - 1]) {
+ throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+ }
+ $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+ $this->prefixDirsPsr4[$prefix] = (array) $paths;
+ } elseif ($prepend) {
+ // Prepend directories for an already registered namespace.
+ $this->prefixDirsPsr4[$prefix] = array_merge(
+ (array) $paths,
+ $this->prefixDirsPsr4[$prefix]
+ );
+ } else {
+ // Append directories for an already registered namespace.
+ $this->prefixDirsPsr4[$prefix] = array_merge(
+ $this->prefixDirsPsr4[$prefix],
+ (array) $paths
+ );
+ }
+ }
+
+ /**
+ * Registers a set of PSR-0 directories for a given prefix,
+ * replacing any others previously set for this prefix.
+ *
+ * @param string $prefix The prefix
+ * @param array|string $paths The PSR-0 base directories
+ */
+ public function set($prefix, $paths)
+ {
+ if (!$prefix) {
+ $this->fallbackDirsPsr0 = (array) $paths;
+ } else {
+ $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+ }
+ }
+
+ /**
+ * Registers a set of PSR-4 directories for a given namespace,
+ * replacing any others previously set for this namespace.
+ *
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param array|string $paths The PSR-4 base directories
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function setPsr4($prefix, $paths)
+ {
+ if (!$prefix) {
+ $this->fallbackDirsPsr4 = (array) $paths;
+ } else {
+ $length = strlen($prefix);
+ if ('\\' !== $prefix[$length - 1]) {
+ throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+ }
+ $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+ $this->prefixDirsPsr4[$prefix] = (array) $paths;
+ }
+ }
+
+ /**
+ * Turns on searching the include path for class files.
+ *
+ * @param bool $useIncludePath
+ */
+ public function setUseIncludePath($useIncludePath)
+ {
+ $this->useIncludePath = $useIncludePath;
+ }
+
+ /**
+ * Can be used to check if the autoloader uses the include path to check
+ * for classes.
+ *
+ * @return bool
+ */
+ public function getUseIncludePath()
+ {
+ return $this->useIncludePath;
+ }
+
+ /**
+ * Registers this instance as an autoloader.
+ *
+ * @param bool $prepend Whether to prepend the autoloader or not
+ */
+ public function register($prepend = false)
+ {
+ spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+ }
+
+ /**
+ * Unregisters this instance as an autoloader.
+ */
+ public function unregister()
+ {
+ spl_autoload_unregister(array($this, 'loadClass'));
+ }
+
+ /**
+ * Loads the given class or interface.
+ *
+ * @param string $class The name of the class
+ * @return bool|null True if loaded, null otherwise
+ */
+ public function loadClass($class)
+ {
+ if ($file = $this->findFile($class)) {
+ includeFile($file);
+
+ return true;
+ }
+ }
+
+ /**
+ * Finds the path to the file where the class is defined.
+ *
+ * @param string $class The name of the class
+ *
+ * @return string|false The path if found, false otherwise
+ */
+ public function findFile($class)
+ {
+ // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+ if ('\\' == $class[0]) {
+ $class = substr($class, 1);
+ }
+
+ // class map lookup
+ if (isset($this->classMap[$class])) {
+ return $this->classMap[$class];
+ }
+
+ $file = $this->findFileWithExtension($class, '.php');
+
+ // Search for Hack files if we are running on HHVM
+ if ($file === null && defined('HHVM_VERSION')) {
+ $file = $this->findFileWithExtension($class, '.hh');
+ }
+
+ if ($file === null) {
+ // Remember that this class does not exist.
+ return $this->classMap[$class] = false;
+ }
+
+ return $file;
+ }
+
+ private function findFileWithExtension($class, $ext)
+ {
+ // PSR-4 lookup
+ $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+ $first = $class[0];
+ if (isset($this->prefixLengthsPsr4[$first])) {
+ foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+ if (0 === strpos($class, $prefix)) {
+ foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+ return $file;
+ }
+ }
+ }
+ }
+ }
+
+ // PSR-4 fallback dirs
+ foreach ($this->fallbackDirsPsr4 as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+ return $file;
+ }
+ }
+
+ // PSR-0 lookup
+ if (false !== $pos = strrpos($class, '\\')) {
+ // namespaced class name
+ $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+ . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+ } else {
+ // PEAR-like class name
+ $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+ }
+
+ if (isset($this->prefixesPsr0[$first])) {
+ foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+ if (0 === strpos($class, $prefix)) {
+ foreach ($dirs as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+ return $file;
+ }
+ }
+ }
+ }
+ }
+
+ // PSR-0 fallback dirs
+ foreach ($this->fallbackDirsPsr0 as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+ return $file;
+ }
+ }
+
+ // PSR-0 include paths.
+ if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+ return $file;
+ }
+ }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+ include $file;
+}
Added: trunk/vendor/composer/autoload_classmap.php
===================================================================
--- trunk/vendor/composer/autoload_classmap.php	 (rev 0)
+++ trunk/vendor/composer/autoload_classmap.php	2014年12月16日 13:44:44 UTC (rev 9443)
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
Added: trunk/vendor/composer/autoload_namespaces.php
===================================================================
--- trunk/vendor/composer/autoload_namespaces.php	 (rev 0)
+++ trunk/vendor/composer/autoload_namespaces.php	2014年12月16日 13:44:44 UTC (rev 9443)
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+ 'Twig_' => array($vendorDir . '/twig/twig/lib'),
+);
...
 
[truncated message content]

Revision: 9442
 http://sourceforge.net/p/phpwiki/code/9442
Author: vargenau
Date: 2014年12月11日 18:00:59 +0000 (2014年12月11日)
Log Message:
-----------
Add public/protected/private
Modified Paths:
--------------
 trunk/lib/diff.php
 trunk/lib/diff3.php
 trunk/lib/difflib.php
Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2014年12月10日 17:54:49 UTC (rev 9441)
+++ trunk/lib/diff.php	2014年12月11日 18:00:59 UTC (rev 9442)
@@ -20,7 +20,7 @@
 $this->_tag = '~begin';
 }
 
- function _flushGroup($new_tag)
+ private function _flushGroup($new_tag)
 {
 if ($this->_group !== false) {
 if (!$this->_line)
@@ -34,7 +34,7 @@
 $this->_tag = $new_tag;
 }
 
- function _flushLine($new_tag)
+ private function _flushLine($new_tag)
 {
 $this->_flushGroup($new_tag);
 if ($this->_line)
@@ -42,7 +42,7 @@
 $this->_line = HTML();
 }
 
- function addWords($words, $tag = '')
+ public function addWords($words, $tag = '')
 {
 if ($tag != $this->_tag)
 $this->_flushGroup($tag);
@@ -61,7 +61,7 @@
 }
 }
 
- function getLines()
+ public function getLines()
 {
 $this->_flushLine('~done');
 return $this->_lines;
@@ -79,7 +79,7 @@
 $orig_stripped, $final_stripped);
 }
 
- function _split($lines)
+ private function _split($lines)
 {
 // FIXME: fix POSIX char class.
 if (!preg_match_all('/ ( [^\S\n]+ | [[:alnum:]]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
@@ -91,7 +91,7 @@
 return array($m[0], $m[1]);
 }
 
- function orig()
+ public function orig()
 {
 $orig = new _HWLDF_WordAccumulator;
 
@@ -104,7 +104,7 @@
 return $orig->getLines();
 }
 
- function _final()
+ public function _final()
 {
 $final = new _HWLDF_WordAccumulator;
 
@@ -143,31 +143,31 @@
 parent::__construct($context_lines);
 }
 
- function _start_diff()
+ protected function _start_diff()
 {
 $this->_top = HTML::div(array('class' => 'diff'));
 }
 
- function _end_diff()
+ protected function _end_diff()
 {
 $val = $this->_top;
 unset($this->_top);
 return $val;
 }
 
- function _start_block($header)
+ protected function _start_block($header)
 {
 $this->_block = HTML::div(array('class' => 'block'),
 HTML::samp($header));
 }
 
- function _end_block()
+ protected function _end_block()
 {
 $this->_top->pushContent($this->_block);
 unset($this->_block);
 }
 
- function _lines($lines, $class, $prefix = false, $elem = false)
+ protected function _lines($lines, $class, $prefix = false, $elem = false)
 {
 if (!$prefix)
 $prefix = HTML::raw('&nbsp;');
@@ -183,22 +183,22 @@
 $this->_block->pushContent($div);
 }
 
- function _context($lines)
+ protected function _context($lines)
 {
 $this->_lines($lines, 'context');
 }
 
- function _deleted($lines)
+ protected function _deleted($lines)
 {
 $this->_lines($lines, 'deleted', '-', 'del');
 }
 
- function _added($lines)
+ protected function _added($lines)
 {
 $this->_lines($lines, 'added', '+', 'ins');
 }
 
- function _changed($orig, $final)
+ protected function _changed($orig, $final)
 {
 $diff = new WordLevelDiff($orig, $final);
 $this->_lines($diff->orig(), 'original', '-');
Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2014年12月10日 17:54:49 UTC (rev 9441)
+++ trunk/lib/diff3.php	2014年12月11日 18:00:59 UTC (rev 9442)
@@ -21,7 +21,7 @@
 $this->final2 = $final2 ? $final2 : array();
 }
 
- function merged()
+ protected function merged()
 {
 if (!isset($this->_merged)) {
 if ($this->final1 === $this->final2)
@@ -34,7 +34,7 @@
 return $this->_merged;
 }
 
- function is_conflict()
+ protected function is_conflict()
 {
 return $this->merged() === false;
 }
@@ -51,12 +51,12 @@
 $this->final2 = &$this->orig;
 }
 
- function merged()
+ protected function merged()
 {
 return $this->orig;
 }
 
- function is_conflict()
+ protected function is_conflict()
 {
 return false;
 }
@@ -73,40 +73,42 @@
 $this->_init();
 }
 
- function _init()
+ private function _init()
 {
- $this->orig = $this->final1 = $this->final2 = array();
+ $this->orig = array();
+ $this->final1 = array();
+ $this->final2 = array();
 }
 
- function _append(&$array, $lines)
+ private function _append(&$array, $lines)
 {
 array_splice($array, sizeof($array), 0, $lines);
 }
 
- function input($lines)
+ public function input($lines)
 {
 if ($lines)
 $this->_append($this->orig, $lines);
 }
 
- function out1($lines)
+ public function out1($lines)
 {
 if ($lines)
 $this->_append($this->final1, $lines);
 }
 
- function out2($lines)
+ public function out2($lines)
 {
 if ($lines)
 $this->_append($this->final2, $lines);
 }
 
- function is_empty()
+ private function is_empty()
 {
 return !$this->orig && !$this->final1 && !$this->final2;
 }
 
- function finish()
+ public function finish()
 {
 if ($this->is_empty())
 return false;
@@ -128,7 +130,7 @@
 $eng->diff($orig, $final2));
 }
 
- function __diff3($edits1, $edits2)
+ private function __diff3($edits1, $edits2)
 {
 $blocks = array();
 $bb = new _Diff3_BlockBuilder;
@@ -136,11 +138,6 @@
 $e1 = current($edits1);
 $e2 = current($edits2);
 while ($e1 || $e2) {
-// echo "====\n";
-// print_r($e1);
-// print_r($e2);
-// echo "====\n";
-
 if ($e1 && $e2 && $e1->type == 'copy' && $e2->type == 'copy') {
 // We have copy blocks from both diffs. This is the (only)
 // time we want to emit a diff3 copy block.
@@ -195,7 +192,7 @@
 return $blocks;
 }
 
- function merged_output($label1 = false, $label2 = false)
+ public function merged_output($label1 = false, $label2 = false)
 {
 $lines = array();
 foreach ($this->blocks as $block) {
Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2014年12月10日 17:54:49 UTC (rev 9441)
+++ trunk/lib/difflib.php	2014年12月11日 18:00:59 UTC (rev 9442)
@@ -14,14 +14,14 @@
 public $orig;
 public $final;
 
- abstract function reverse();
+ abstract public function reverse();
 
- function norig()
+ public function norig()
 {
 return $this->orig ? sizeof($this->orig) : 0;
 }
 
- function nfinal()
+ public function nfinal()
 {
 return $this->final ? sizeof($this->final) : 0;
 }
@@ -39,7 +39,7 @@
 $this->final = $final;
 }
 
- function reverse()
+ public function reverse()
 {
 return new _DiffOp_Copy($this->final, $this->orig);
 }
@@ -55,7 +55,7 @@
 $this->final = false;
 }
 
- function reverse()
+ public function reverse()
 {
 return new _DiffOp_Add($this->orig);
 }
@@ -71,7 +71,7 @@
 $this->orig = false;
 }
 
- function reverse()
+ public function reverse()
 {
 return new _DiffOp_Delete($this->final);
 }
@@ -87,7 +87,7 @@
 $this->final = $final;
 }
 
- function reverse()
+ public function reverse()
 {
 return new _DiffOp_Change($this->final, $this->orig);
 }
@@ -125,7 +125,7 @@
 public $seq;
 public $in_seq;
 
- function diff($from_lines, $to_lines)
+ public function diff($from_lines, $to_lines)
 {
 $n_from = sizeof($from_lines);
 $n_to = sizeof($to_lines);
@@ -229,7 +229,7 @@
 * match. The caller must trim matching lines from the beginning and end
 * of the portions it is going to specify.
 */
- function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
+ private function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
 {
 $flip = false;
 
@@ -303,7 +303,7 @@
 return array($this->lcs, $seps);
 }
 
- function _lcs_pos($ypos)
+ private function _lcs_pos($ypos)
 {
 $end = $this->lcs;
 if ($end == 0 || $ypos > $this->seq[$end]) {
@@ -340,7 +340,7 @@
 * Note that XLIM, YLIM are exclusive bounds.
 * All line numbers are origin-0 and discarded lines are not counted.
 */
- function _compareseq($xoff, $xlim, $yoff, $ylim)
+ private function _compareseq($xoff, $xlim, $yoff, $ylim)
 {
 // Slide down the bottom initial diagonal.
 while ($xoff < $xlim && $yoff < $ylim
@@ -397,7 +397,7 @@
 *
 * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
 */
- function _shift_boundaries($lines, &$changed, $other_changed)
+ private function _shift_boundaries($lines, &$changed, $other_changed)
 {
 $i = 0;
 $j = 0;
@@ -526,35 +526,14 @@
 {
 $eng = new _DiffEngine;
 $this->edits = $eng->diff($from_lines, $to_lines);
- //$this->_check($from_lines, $to_lines);
 }
 
 /**
- * Compute reversed Diff.
- *
- * SYNOPSIS:
- *
- * $diff = new Diff($lines1, $lines2);
- * $rev = $diff->reverse();
- * @return object A Diff object representing the inverse of the
- * original diff.
- */
- function reverse()
- {
- $rev = $this;
- $rev->edits = array();
- foreach ($this->edits as $edit) {
- $rev->edits[] = $edit->reverse();
- }
- return $rev;
- }
-
- /**
 * Check for empty diff.
 *
 * @return bool True iff two sequences were identical.
 */
- function isEmpty()
+ public function isEmpty()
 {
 foreach ($this->edits as $edit) {
 if ($edit->type != 'copy')
@@ -564,23 +543,6 @@
 }
 
 /**
- * Compute the length of the Longest Common Subsequence (LCS).
- *
- * This is mostly for diagnostic purposed.
- *
- * @return int The length of the LCS.
- */
- function lcs()
- {
- $lcs = 0;
- foreach ($this->edits as $edit) {
- if ($edit->type == 'copy')
- $lcs += sizeof($edit->orig);
- }
- return $lcs;
- }
-
- /**
 * Get the original set of lines.
 *
 * This reconstructs the $from_lines parameter passed to the
@@ -588,7 +550,7 @@
 *
 * @return array The original sequence of strings.
 */
- function orig()
+ public function orig()
 {
 $lines = array();
 
@@ -607,7 +569,7 @@
 *
 * @return array The sequence of strings.
 */
- function _final()
+ public function _final()
 {
 $lines = array();
 
@@ -617,37 +579,6 @@
 }
 return $lines;
 }
-
- /**
- * Check a Diff for validity.
- *
- * This is here only for debugging purposes.
- * @param string $from_lines
- * @param string $to_lines
- */
- function _check($from_lines, $to_lines)
- {
- if (serialize($from_lines) != serialize($this->orig()))
- trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
- if (serialize($to_lines) != serialize($this->_final()))
- trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
-
- $rev = $this->reverse();
- if (serialize($to_lines) != serialize($rev->orig()))
- trigger_error("Reversed original doesn't match", E_USER_ERROR);
- if (serialize($from_lines) != serialize($rev->_final()))
- trigger_error("Reversed final doesn't match", E_USER_ERROR);
-
- $prevtype = 'none';
- foreach ($this->edits as $edit) {
- if ($prevtype == $edit->type)
- trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
- $prevtype = $edit->type;
- }
-
- $lcs = $this->lcs();
- trigger_error("Diff okay: LCS = $lcs", E_USER_NOTICE);
- }
 }
 
 /**
@@ -738,7 +669,7 @@
 * @param $diff object A Diff object.
 * @return string The formatted output.
 */
- function format($diff)
+ public function format($diff)
 {
 
 $xi = $yi = 1;
@@ -793,7 +724,7 @@
 return $this->_end_diff();
 }
 
- function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
+ private function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
 {
 $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
 foreach ($edits as $edit) {
@@ -808,19 +739,19 @@
 $this->_end_block();
 }
 
- function _start_diff()
+ protected function _start_diff()
 {
 ob_start();
 }
 
- function _end_diff()
+ protected function _end_diff()
 {
 $val = ob_get_contents();
 ob_end_clean();
 return $val;
 }
 
- function _block_header($xbeg, $xlen, $ybeg, $ylen)
+ protected function _block_header($xbeg, $xlen, $ybeg, $ylen)
 {
 if ($xlen > 1)
 $xbeg .= "," . ($xbeg + $xlen - 1);
@@ -830,37 +761,37 @@
 return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
 }
 
- function _start_block($header)
+ protected function _start_block($header)
 {
 echo $header;
 }
 
- function _end_block()
+ protected function _end_block()
 {
 }
 
- function _lines($lines, $prefix = ' ')
+ protected function _lines($lines, $prefix = ' ')
 {
 foreach ($lines as $line)
 echo "$prefix $line\n";
 }
 
- function _context($lines)
+ protected function _context($lines)
 {
 $this->_lines($lines);
 }
 
- function _added($lines)
+ protected function _added($lines)
 {
 $this->_lines($lines, ">");
 }
 
- function _deleted($lines)
+ protected function _deleted($lines)
 {
 $this->_lines($lines, "<");
 }
 
- function _changed($orig, $final)
+ protected function _changed($orig, $final)
 {
 $this->_deleted($orig);
 echo "---\n";
@@ -881,7 +812,7 @@
 $this->trailing_context_lines = $context_lines;
 }
 
- function _block_header($xbeg, $xlen, $ybeg, $ylen)
+ protected function _block_header($xbeg, $xlen, $ybeg, $ylen)
 {
 if ($xlen != 1)
 $xbeg .= "," . $xlen;
@@ -890,17 +821,17 @@
 return "@@ -$xbeg +$ybeg @@\n";
 }
 
- function _added($lines)
+ protected function _added($lines)
 {
 $this->_lines($lines, "+");
 }
 
- function _deleted($lines)
+ protected function _deleted($lines)
 {
 $this->_lines($lines, "-");
 }
 
- function _changed($orig, $final)
+ protected function _changed($orig, $final)
 {
 $this->_deleted($orig);
 $this->_added($final);
@@ -926,7 +857,7 @@
 $this->trailing_context_lines = $context_lines;
 }
 
- function _lines($lines, $prefix = '')
+ protected function _lines($lines, $prefix = '')
 {
 if (!$prefix == '')
 echo "$prefix\n";
@@ -936,22 +867,22 @@
 echo "$prefix\n";
 }
 
- function _added($lines)
+ protected function _added($lines)
 {
 $this->_lines($lines, ">>>>>>>");
 }
 
- function _deleted($lines)
+ protected function _deleted($lines)
 {
 $this->_lines($lines, "<<<<<<<");
 }
 
- function _block_header($xbeg, $xlen, $ybeg, $ylen)
+ protected function _block_header($xbeg, $xlen, $ybeg, $ylen)
 {
 return "";
 }
 
- function _changed($orig, $final)
+ protected function _changed($orig, $final)
 {
 $this->_deleted($orig);
 $this->_added($final);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9441
 http://sourceforge.net/p/phpwiki/code/9441
Author: vargenau
Date: 2014年12月10日 17:54:49 +0000 (2014年12月10日)
Log Message:
-----------
No space at end of line
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
 trunk/lib/main.php
 trunk/lib/plugin/IncludePage.php
 trunk/lib/plugin/Template.php
 trunk/lib/plugin/WikiAdminSearchReplace.php
 trunk/lib/stdlib.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2014年12月09日 17:24:27 UTC (rev 9440)
+++ trunk/lib/WikiTheme.php	2014年12月10日 17:54:49 UTC (rev 9441)
@@ -201,7 +201,7 @@
 * @var WikiRequest $request
 */
 global $request;
- 
+
 $this->_name = $theme_name;
 $this->_themes_dir = NormalizeLocalFileName("themes");
 $this->_path = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : "";
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2014年12月09日 17:24:27 UTC (rev 9440)
+++ trunk/lib/main.php	2014年12月10日 17:54:49 UTC (rev 9441)
@@ -381,7 +381,7 @@
 if (!empty($HTTP_GET_VARS['start_debug'])) // zend ide support
 return WikiURL($pagename, array('action' => $action, 'start_debug' => 1));
 elseif ($action == 'edit')
- return WikiURL($pagename); 
+ return WikiURL($pagename);
 else
 return WikiURL($pagename, array('action' => $action));
 }
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2014年12月09日 17:24:27 UTC (rev 9440)
+++ trunk/lib/plugin/IncludePage.php	2014年12月10日 17:54:49 UTC (rev 9441)
@@ -68,7 +68,7 @@
 $this->run($request->_dbi, $argstr, $request, $basepage);
 }
 
- $backlinks[] = array('linkto' => $page->name); 
+ $backlinks[] = array('linkto' => $page->name);
 return $backlinks;
 }
 
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2014年12月09日 17:24:27 UTC (rev 9440)
+++ trunk/lib/plugin/Template.php	2014年12月10日 17:54:49 UTC (rev 9441)
@@ -100,7 +100,7 @@
 $this->run($request->_dbi, $argstr, $request, $basepage);
 }
 
- $backlinks[] = array('linkto' => $page->name); 
+ $backlinks[] = array('linkto' => $page->name);
 return $backlinks;
 }
 
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2014年12月09日 17:24:27 UTC (rev 9440)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2014年12月10日 17:54:49 UTC (rev 9441)
@@ -116,7 +116,7 @@
 } else {
 $columns = array_merge($args,
 // with highlighted search for SearchReplace
- array('types' => array('hi_content' 
+ array('types' => array('hi_content'
 => new _PageList_Column_content('rev:hi_content', _("Content")))));
 }
 
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014年12月09日 17:24:27 UTC (rev 9440)
+++ trunk/lib/stdlib.php	2014年12月10日 17:54:49 UTC (rev 9441)
@@ -895,7 +895,7 @@
 if (is_a($page, 'WikiDB_Page'))
 return $page->getName();
 elseif (is_a($page, 'WikiDB_PageRevision'))
- return $page->getPageName(); 
+ return $page->getPageName();
 elseif (is_a($page, 'WikiPageName'))
 return $page->name;
 return $page;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9440
 http://sourceforge.net/p/phpwiki/code/9440
Author: vargenau
Date: 2014年12月09日 17:24:27 +0000 (2014年12月09日)
Log Message:
-----------
Change syntax to please Template
Modified Paths:
--------------
 trunk/themes/default/templates/editpage.tmpl
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2014年12月09日 15:29:48 UTC (rev 9439)
+++ trunk/themes/default/templates/editpage.tmpl	2014年12月09日 17:24:27 UTC (rev 9440)
@@ -21,7 +21,11 @@
 <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
 <br class="clear-floats" />
 <table class="fullwidth">
- <tr><td><?php if (isset($EDIT_TOOLBAR)) echo $EDIT_TOOLBAR ?></td>
+ <tr><td>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
+ </td>
 <td class="align-right"><div id="editarea-size">
 <?php echo _("Size")._(":") ?>
 <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9438
 http://sourceforge.net/p/phpwiki/code/9438
Author: vargenau
Date: 2014年12月09日 15:10:09 +0000 (2014年12月09日)
Log Message:
-----------
Remove unused
Modified Paths:
--------------
 trunk/lib/IniConfig.php
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2014年12月09日 10:56:24 UTC (rev 9437)
+++ trunk/lib/IniConfig.php	2014年12月09日 15:10:09 UTC (rev 9438)
@@ -354,9 +354,11 @@
 foreach (array('major', 'minor', 'author') as $major) {
 foreach (array('max_age', 'min_age', 'min_keep', 'keep', 'max_keep') as $max) {
 $item = strtoupper($major) . '_' . strtoupper($max);
- if (defined($item)) $val = constant($item);
+ if (defined($item))
+ $val = constant($item);
 elseif (array_key_exists($item, $rs))
- $val = $rs[$item]; elseif (array_key_exists($item, $rsdef))
+ $val = $rs[$item];
+ elseif (array_key_exists($item, $rsdef))
 $val = $rsdef[$item];
 if (!isset($ExpireParams[$major]))
 $ExpireParams[$major] = array();
@@ -570,8 +572,8 @@
 // moved from lib/config.php [1ms]
 function fixup_static_configs($file)
 {
- global $FieldSeparator, $WikiNameRegexp, $AllActionPages;
- global $DBParams, $LANG, $ErrorManager;
+ global $FieldSeparator, $AllActionPages;
+ global $DBParams;
 // init FileFinder to add proper include paths
 FindFile("lib/interwiki.map", true);
 
@@ -847,8 +849,7 @@
 */
 function fixup_dynamic_configs()
 {
- global $WikiNameRegexp;
- global $DBParams, $LANG;
+ global $LANG;
 
 if (defined('INCLUDE_PATH') and INCLUDE_PATH) {
 @ini_set('include_path', INCLUDE_PATH);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9437
 http://sourceforge.net/p/phpwiki/code/9437
Author: vargenau
Date: 2014年12月09日 10:56:24 +0000 (2014年12月09日)
Log Message:
-----------
Add public/protected/private
Modified Paths:
--------------
 trunk/lib/editpage.php
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2014年12月08日 17:29:32 UTC (rev 9436)
+++ trunk/lib/editpage.php	2014年12月09日 10:56:24 UTC (rev 9437)
@@ -91,7 +91,7 @@
 header("Content-Type: text/html; charset=UTF-8");
 }
 
- function editPage()
+ public function editPage()
 {
 $saveFailed = false;
 $tokens = &$this->tokens;
@@ -156,7 +156,7 @@
 return true;
 } elseif ($this->editaction == 'upload') {
 // run plugin UpLoad
- $plugin = WikiPluginLoader("UpLoad");
+ $plugin = new WikiPluginLoader("UpLoad");
 $plugin->run();
 // add link to content
 ;
@@ -210,7 +210,7 @@
 return $this->output('editpage', _("Edit: %s"));
 }
 
- function output($template, $title_fs)
+ public function output($template, $title_fs)
 {
 global $WikiTheme;
 $selected = &$this->selected;
@@ -238,7 +238,7 @@
 return true;
 }
 
- function viewSource()
+ public function viewSource()
 {
 assert($this->isInitialEdit());
 assert($this->selected);
@@ -248,7 +248,7 @@
 return $this->output('viewsource', _("View Source: %s"));
 }
 
- function updateLock()
+ private function updateLock()
 {
 $changed = false;
 if (!ENABLE_PAGE_PUBLIC && !ENABLE_EXTERNAL_PAGES) {
@@ -290,7 +290,7 @@
 return $changed; // lock changed.
 }
 
- function savePage()
+ public function savePage()
 {
 $request = &$this->request;
 
@@ -379,23 +379,23 @@
 return true;
 }
 
- function isConcurrentUpdate()
+ protected function isConcurrentUpdate()
 {
 assert($this->current->getVersion() >= $this->_currentVersion);
 return $this->current->getVersion() != $this->_currentVersion;
 }
 
- function canEdit()
+ protected function canEdit()
 {
 return !$this->page->get('locked') || $this->user->isAdmin();
 }
 
- function isInitialEdit()
+ protected function isInitialEdit()
 {
 return $this->_initialEdit;
 }
 
- function isUnchanged()
+ private function isUnchanged()
 {
 $current = &$this->current;
 return $this->_content == $current->getPackedContent();
@@ -411,7 +411,7 @@
 * ENABLE_SPAMASSASSIN: content patterns by babycart (only php >= 4.3 for now)
 * ENABLE_SPAMBLOCKLIST: content domain blacklist
 */
- function isSpam()
+ private function isSpam()
 {
 $current = &$this->current;
 $request = &$this->request;
@@ -487,14 +487,14 @@
 
 /** Number of external links in the wikitext
 */
- function numLinks(&$text)
+ private function numLinks(&$text)
 {
 return substr_count($text, "http://") + substr_count($text, "https://");
 }
 
 /** Header of the Anti Spam message
 */
- function getSpamMessage()
+ private function getSpamMessage()
 {
 return
 HTML(HTML::h2(_("Spam Prevention")),
@@ -504,21 +504,21 @@
 HTML::p(""));
 }
 
- function getPreview()
+ protected function getPreview()
 {
 require_once 'lib/PageType.php';
 $this->_content = $this->getContent();
 return new TransformedText($this->page, $this->_content, $this->meta);
 }
 
- function getConvertedPreview()
+ protected function getConvertedPreview()
 {
 require_once 'lib/PageType.php';
 $this->_content = $this->getContent();
 return new TransformedText($this->page, $this->_content, $this->meta);
 }
 
- function getDiff()
+ private function getDiff()
 {
 require_once 'lib/diff.php';
 $html = HTML();
@@ -537,7 +537,7 @@
 }
 
 // possibly convert HTMLAREA content back to Wiki markup
- function getContent()
+ private function getContent()
 {
 if (ENABLE_WYSIWYG) {
 // don't store everything as html
@@ -555,7 +555,7 @@
 }
 }
 
- function getLockedMessage()
+ protected function getLockedMessage()
 {
 return
 HTML(HTML::h2(_("Page Locked")),
@@ -564,12 +564,12 @@
 HTML::p(_("Sorry for the inconvenience.")));
 }
 
- function isModerated()
+ private function isModerated()
 {
 return $this->page->get('moderation');
 }
 
- function getModeratedMessage()
+ private function getModeratedMessage()
 {
 return
 HTML(HTML::h2(WikiLink(_("ModeratedPage"))),
@@ -578,7 +578,7 @@
 WikiLink(_("UserPreferences")))));
 }
 
- function getConflictMessage($unresolved = false)
+ protected function getConflictMessage($unresolved = false)
 {
 /*
 xgettext only knows about c/c++ line-continuation strings
@@ -608,7 +608,7 @@
 $message);
 }
 
- function getTextArea()
+ private function getTextArea()
 {
 $request = &$this->request;
 
@@ -636,7 +636,7 @@
 return $textarea;
 }
 
- function getFormElements()
+ protected function getFormElements()
 {
 global $WikiTheme;
 $request = &$this->request;
@@ -746,7 +746,7 @@
 $this->request->redirect(WikiURL($this->page, array(), 'absolute_url'));
 }
 
- function _restoreState()
+ private function _restoreState()
 {
 $request = &$this->request;
 
@@ -797,7 +797,7 @@
 return true;
 }
 
- function _initializeState()
+ private function _initializeState()
 {
 $request = &$this->request;
 $current = &$this->current;
@@ -830,7 +830,7 @@
 class LoadFileConflictPageEditor
 extends PageEditor
 {
- function editPage($saveFailed = true)
+ public function editPage($saveFailed = true)
 {
 $tokens = &$this->tokens;
 
@@ -905,7 +905,7 @@
 return $this->output('editpage', _("Merge and Edit: %s"));
 }
 
- function output($template, $title_fs)
+ public function output($template, $title_fs)
 {
 $selected = &$this->selected;
 $current = &$this->current;
@@ -931,7 +931,7 @@
 return true;
 }
 
- function getConflictMessage($unresolved = false)
+ protected function getConflictMessage($unresolved = false)
 {
 $message = HTML(HTML::p(fmt("Some of the changes could not automatically be combined. Please look for sections beginning with "%s", and ending with "%s". You will need to edit those sections by hand before you click Save.",
 "<<<<<<<",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9436
 http://sourceforge.net/p/phpwiki/code/9436
Author: vargenau
Date: 2014年12月08日 17:29:32 +0000 (2014年12月08日)
Log Message:
-----------
Do not update page if already present in theme pgsrc
Modified Paths:
--------------
 trunk/lib/upgrade.php
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014年12月08日 17:28:47 UTC (rev 9435)
+++ trunk/lib/upgrade.php	2014年12月08日 17:29:32 UTC (rev 9436)
@@ -163,6 +163,7 @@
 $path = $WikiTheme->file("pgsrc");
 // TBD: the call to fileSet prints a warning:
 // Notice: Unable to open directory 'themes/MonoBook/pgsrc' for reading
+ $themepgsrc = array();
 $pgsrc = new fileSet($path);
 if ($pgsrc->getFiles()) {
 echo "<h2>", sprintf(_("Check for necessary theme %s updates"),
@@ -171,6 +172,7 @@
 if (substr($filename, -1, 1) == '~') continue;
 if (substr($filename, -5, 5) == '.orig') continue;
 $pagename = urldecode($filename);
+ $themepgsrc[] = $pagename;
 $this->doPgsrcUpdate($pagename, $path, $filename);
 }
 }
@@ -198,7 +200,11 @@
 if ($this->db_version < 1030.12200612) {
 $this->_rename_to_help_page($pagename);
 }
- $this->doPgsrcUpdate($pagename, $path, $filename);
+ if (in_array($pagename, $themepgsrc)) {
+ echo sprintf(_('%s already checked in theme pgsrc.'), $pagename).' '._('Skipped.').'<br />';
+ } else {
+ $this->doPgsrcUpdate($pagename, $path, $filename);
+ }
 }
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9435
 http://sourceforge.net/p/phpwiki/code/9435
Author: vargenau
Date: 2014年12月08日 17:28:47 +0000 (2014年12月08日)
Log Message:
-----------
Fix "Remove unused"
Modified Paths:
--------------
 trunk/lib/loadsave.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2014年12月08日 17:26:33 UTC (rev 9434)
+++ trunk/lib/loadsave.php	2014年12月08日 17:28:47 UTC (rev 9435)
@@ -1268,7 +1268,7 @@
 'content' => preg_replace('/[ \t\r]*\n/', "\n",
 chop($text))
 );
- SavePage($request, $pageinfo, sprintf(_("plain file %s")));
+ SavePage($request, $pageinfo, sprintf(_("plain file %s"), $filename));
 }
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9434
 http://sourceforge.net/p/phpwiki/code/9434
Author: vargenau
Date: 2014年12月08日 17:26:33 +0000 (2014年12月08日)
Log Message:
-----------
Add nodb=true for wiki upgrade
Modified Paths:
--------------
 trunk/wikilist.php
Modified: trunk/wikilist.php
===================================================================
--- trunk/wikilist.php	2014年12月08日 17:16:56 UTC (rev 9433)
+++ trunk/wikilist.php	2014年12月08日 17:26:33 UTC (rev 9434)
@@ -40,9 +40,9 @@
 
 $headers = array(
 _('Project Name'),
- _('Project Register Time'),
- _('Unix name'),
- _('Public?')
+ _('Registered'),
+ _('Unix Name'),
+ _('Is Public?')
 );
 if (forge_get_config('allow_external')) {
 $headers[] = _("External?");
@@ -81,7 +81,7 @@
 echo '<td>' . $grp['is_external'] . '</td>';
 }
 echo '<td>' . $grp['members'] . '</td>';
- echo '<td><a href="/wiki/g/' . $grp['unix_group_name'] . '/?action=upgrade">' . _("Upgrade") . '</a></td>';
+ echo '<td><a title="'._('Upgrade').' '.$grp['group_name'].'" href="/wiki/g/'.$grp['unix_group_name'].'/?action=upgrade&amp;nodb=true">'._('Upgrade').'</a></td>';
 echo '</tr>';
 $i++;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9433
 http://sourceforge.net/p/phpwiki/code/9433
Author: vargenau
Date: 2014年12月08日 17:16:56 +0000 (2014年12月08日)
Log Message:
-----------
Remove unused
Modified Paths:
--------------
 trunk/lib/loadsave.php
 trunk/lib/plugin/WikiBlog.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2014年12月08日 17:14:15 UTC (rev 9432)
+++ trunk/lib/loadsave.php	2014年12月08日 17:16:56 UTC (rev 9433)
@@ -724,7 +724,6 @@
 }
 $page_iter->free();
 
- $attrib = false; //array('is_ascii' => 0);
 if (!empty($WikiTheme->dumped_images) and is_array($WikiTheme->dumped_images)) {
 // @mkdir("$directory/images");
 foreach ($WikiTheme->dumped_images as $img_file) {
@@ -866,7 +865,7 @@
 //
 ////////////////////////////////////////////////////////////////
 
-function SavePage(&$request, &$pageinfo, $source, $filename)
+function SavePage(&$request, &$pageinfo, $source)
 {
 static $overwite_all = false;
 $pagedata = $pageinfo['pagedata']; // Page level meta-data.
@@ -912,10 +911,8 @@
 $edit = $request->getArg('edit');
 if ($merging) {
 if (isset($edit['keep_old'])) {
- $merging = false;
 $skip = true;
 } elseif (isset($edit['overwrite'])) {
- $merging = false;
 $overwrite = true;
 } elseif ($current and (!$current->hasDefaultContents())
 && ($current->getPackedContent() != $content)
@@ -949,7 +946,6 @@
 $versiondata['author'] = ADMIN_USER;
 $versiondata['author_id'] = ADMIN_USER;
 $mesg->pushContent(' - ', _("New page"));
- $isnew = true;
 } else {
 if ((!$current->hasDefaultContents())
 && ($current->getPackedContent() != $content)
@@ -978,7 +974,6 @@
 $current->getVersion()));
 $skip = true;
 }
- $isnew = false;
 }
 
 if (!$skip) {
@@ -1001,7 +996,6 @@
 $f = str_replace(sprintf(_("plain file %s"), ''), '', $f);
 //check if uploaded file? they pass just the content, but the file is gone
 if (@stat($f)) {
- global $WikiTheme;
 $meb = Button(array('action' => 'loadfile',
 'merge' => true,
 'source' => $f),
@@ -1222,7 +1216,7 @@
 * because the sql passwords are in plaintext there. And the webserver must be able to read it.
 * Detected by Santtu Jarvi.
 */
-function LoadFile(&$request, $filename, $text = false, $mtime = false)
+function LoadFile(&$request, $filename, $text = false)
 {
 if (preg_match("/config$/", dirname($filename)) // our or other config
 and preg_match("/config.*\.ini/", basename($filename))
@@ -1233,8 +1227,6 @@
 }
 if (!is_string($text)) {
 // Read the file.
- $stat = stat($filename);
- $mtime = $stat[9];
 $text = implode("", file($filename));
 }
 
@@ -1244,9 +1236,6 @@
 // FIXME: basename("filewithnoslashes") seems to return garbage sometimes.
 $basename = basename("/dummy/" . $filename);
 
- if (!$mtime)
- $mtime = time(); // Last resort.
-
 $default_pagename = rawurldecode($basename);
 if (($parts = ParseMimeifiedPages($text))) {
 if (count($parts) > 1)
@@ -1256,8 +1245,7 @@
 // force overwrite
 if (count($parts) > 1)
 $request->setArg('overwrite', 1);
- SavePage($request, $pageinfo, sprintf(_("MIME file %s"),
- $filename), $basename);
+ SavePage($request, $pageinfo, sprintf(_("MIME file %s"), $filename));
 }
 if (count($parts) > 1)
 if ($overwrite)
@@ -1267,8 +1255,7 @@
 } elseif (($pageinfo = ParseSerializedPage($text, $default_pagename,
 $request->getUser()))
 ) {
- SavePage($request, $pageinfo, sprintf(_("Serialized file %s"),
- $filename), $basename);
+ SavePage($request, $pageinfo, sprintf(_("Serialized file %s"), $filename));
 } else {
 // plain old file
 $user = $request->getUser();
@@ -1281,8 +1268,7 @@
 'content' => preg_replace('/[ \t\r]*\n/', "\n",
 chop($text))
 );
- SavePage($request, $pageinfo, sprintf(_("plain file %s"), $filename),
- $basename);
+ SavePage($request, $pageinfo, sprintf(_("plain file %s")));
 }
 }
 
@@ -1303,7 +1289,7 @@
 continue;
 }
 longer_timeout($timeout); // longer timeout per page
- LoadFile($request, $fn, $data, $attrib['mtime']);
+ LoadFile($request, $fn, $data);
 }
 }
 
@@ -1446,7 +1432,7 @@
 */
 function SetupWiki(&$request)
 {
- global $GenericPages, $LANG;
+ global $GenericPages;
 
 //FIXME: This is a hack (err, "interim solution")
 // This is a bogo-bogo-login: Login without
@@ -1456,7 +1442,6 @@
 //
 // This really needs to be cleaned up...
 // (I'm working on it.)
- $real_user = $request->_user;
 $request->_user = new _BogoUser(ADMIN_USER);
 
 StartLoadDump($request, _("Loading up virgin wiki"));
Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2014年12月08日 17:14:15 UTC (rev 9432)
+++ trunk/lib/plugin/WikiBlog.php	2014年12月08日 17:16:56 UTC (rev 9433)
@@ -229,7 +229,7 @@
 'pagedata' => array(),
 'versiondata' => array('author' => $blog_meta['creator'], 'is_minor_edit' => 1),
 );
- SavePage($request, $pageinfo, '', '');
+ SavePage($request, $pageinfo, '');
 }
 $redirected = $prefix . $pagename . '/' . preg_replace("/T.*/", "", "$time");
 if (!$dbi->isWikiPage($redirected)) {
@@ -240,7 +240,7 @@
 'pagedata' => array(),
 'versiondata' => array('author' => $blog_meta['creator'], 'is_minor_edit' => 1),
 );
- SavePage($request, $pageinfo, '', '');
+ SavePage($request, $pageinfo, '');
 }
 
 $p = $dbi->getPage($prefix . $pagename . '/'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9432
 http://sourceforge.net/p/phpwiki/code/9432
Author: vargenau
Date: 2014年12月08日 17:14:15 +0000 (2014年12月08日)
Log Message:
-----------
Type compatibility
Modified Paths:
--------------
 trunk/lib/Template.php
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2014年12月08日 14:31:53 UTC (rev 9431)
+++ trunk/lib/Template.php	2014年12月08日 17:14:15 UTC (rev 9432)
@@ -273,7 +273,7 @@
 * For dumping pages as html to a file.
 * Used for action=dumphtml,action=ziphtml,format=pdf,format=xml
 */
-function GeneratePageasXML($content, $title, $page_revision = false, $args = array())
+function GeneratePageasXML($content, $title, $page_revision = null, $args = array())
 {
 global $request;
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9431
 http://sourceforge.net/p/phpwiki/code/9431
Author: vargenau
Date: 2014年12月08日 14:31:53 +0000 (2014年12月08日)
Log Message:
-----------
Indent
Modified Paths:
--------------
 trunk/lib/upgrade.php
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014年12月08日 14:19:26 UTC (rev 9430)
+++ trunk/lib/upgrade.php	2014年12月08日 14:31:53 UTC (rev 9431)
@@ -220,7 +220,8 @@
 private function _rename_to_help_page($pagename)
 {
 $newprefix = _("Help") . "/";
- if (substr($pagename, 0, strlen($newprefix)) != $newprefix) return;
+ if (substr($pagename, 0, strlen($newprefix)) != $newprefix)
+ return;
 $oldname = substr($pagename, strlen($newprefix));
 $this->_rename_page_helper($oldname, $pagename);
 }
@@ -233,7 +234,8 @@
 private function installTable($table, $backend_type)
 {
 global $DBParams;
- if (!$this->isSQL) return;
+ if (!$this->isSQL)
+ return;
 echo _("MISSING"), " ... \n";
 /*
 $schema = findFile("schemas/${backend_type}.sql");
@@ -707,8 +709,6 @@
 echo _("OK"), "<br />\n";
 flush();
 }
-
- return;
 }
 
 /**
@@ -749,7 +749,8 @@
 $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter'));
 $this->error_caught = 0;
 $this->dbi = WikiDB::open($AdminParams);
- if (!$this->error_caught) return true;
+ if (!$this->error_caught)
+ return true;
 // FAILED: redo our connection with the wikiuser
 $this->dbi = WikiDB::open($DBParams);
 $ErrorManager->flushPostponedErrors();
@@ -759,7 +760,8 @@
 
 private function _db_init()
 {
- if (!$this->isSQL) return;
+ if (!$this->isSQL)
+ return;
 
 /* SQLite never needs admin params */
 $backend_type = $this->dbi->_backend->backendType();
@@ -826,7 +828,8 @@
 */
 private function _upgrade_cached_html($verbose = true)
 {
- if (!$this->isSQL) return 0;
+ if (!$this->isSQL)
+ return 0;
 $count = 0;
 if ($this->phpwiki_version >= 1030.10) {
 if ($verbose)
@@ -865,8 +868,8 @@
 */
 private function _convert_cached_html()
 {
- if (!$this->isSQL) return 0;
- //if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
+ if (!$this->isSQL)
+ return 0;
 
 $pages = $this->dbi->getAllPages();
 $cache =& $this->dbi->_cache;
@@ -1013,7 +1016,8 @@
 $this->_configUpdates[] = $entry;
 
 // TODO: find extra file updates
- if (empty($this->_configUpdates)) return;
+ if (empty($this->_configUpdates))
+ return;
 foreach ($this->_configUpdates as $update) {
 $update->check();
 }
@@ -1075,11 +1079,14 @@
 private function _check_if_already_fixed()
 {
 // not yet fixed?
- if (!isset($this->upgrade['name'])) return false;
+ if (!isset($this->upgrade['name']))
+ return false;
 // override with force?
- if ($this->parent->request->getArg('force')) return false;
+ if ($this->parent->request->getArg('force'))
+ return false;
 // already fixed and with an ok version
- if ($this->upgrade['name'] >= $this->fixed_with) return $this->upgrade['name'];
+ if ($this->upgrade['name'] >= $this->fixed_with)
+ return $this->upgrade['name'];
 // already fixed but with an older version. do it again.
 return false;
 }
@@ -1109,7 +1116,8 @@
 
 private function skip()
 { // not applicable
- if (isset($this->silent_skip)) return true;
+ if (isset($this->silent_skip))
+ return true;
 echo " " . _("Skipped.") . "<br />\n";
 flush();
 return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9430
 http://sourceforge.net/p/phpwiki/code/9430
Author: vargenau
Date: 2014年12月08日 14:19:26 +0000 (2014年12月08日)
Log Message:
-----------
Add public/private; remove unused code
Modified Paths:
--------------
 trunk/lib/upgrade.php
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014年12月08日 10:50:45 UTC (rev 9429)
+++ trunk/lib/upgrade.php	2014年12月08日 14:19:26 UTC (rev 9430)
@@ -67,7 +67,7 @@
 $this->isSQL = $this->dbi->_backend->isSQL();
 }
 
- function doPgsrcUpdate($pagename, $path, $filename)
+ private function doPgsrcUpdate($pagename, $path, $filename)
 {
 // don't ever update the HomePage
 if ((defined(HOME_PAGE) and ($pagename == HOME_PAGE))
@@ -117,7 +117,7 @@
 }
 }
 
- function CheckActionPageUpdate()
+ public function CheckActionPageUpdate()
 {
 echo "<h2>", sprintf(_("Check for necessary %s updates"), _("Action Pages")), "</h2>\n";
 // 1.3.13 before we pull in all missing pages, we rename existing ones
@@ -154,7 +154,7 @@
 }
 
 // see loadsave.php for saving new pages.
- function CheckPgsrcUpdate()
+ public function CheckPgsrcUpdate()
 {
 // Check some theme specific pgsrc files (blog, wikilens, fusionforge, custom).
 // We check theme specific pgsrc first in case the page is present in both
@@ -203,7 +203,7 @@
 }
 }
 
- function _rename_page_helper($oldname, $pagename)
+ private function _rename_page_helper($oldname, $pagename)
 {
 echo sprintf(_("rename %s to %s"), $oldname, $pagename), " ...";
 if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
@@ -217,7 +217,7 @@
 }
 }
 
- function _rename_to_help_page($pagename)
+ private function _rename_to_help_page($pagename)
 {
 $newprefix = _("Help") . "/";
 if (substr($pagename, 0, strlen($newprefix)) != $newprefix) return;
@@ -230,7 +230,7 @@
 * and create it.
 * Supported: mysql and generic SQL, for ADODB and PearDB.
 */
- function installTable($table, $backend_type)
+ private function installTable($table, $backend_type)
 {
 global $DBParams;
 if (!$this->isSQL) return;
@@ -395,7 +395,7 @@
 * jeffs-hacks database api (around 1.3.2) later:
 * people should export/import their pages if using that old versions.
 */
- function CheckDatabaseUpdate()
+ public function CheckDatabaseUpdate()
 {
 global $DBParams;
 
@@ -728,7 +728,7 @@
 return false;
 }
 
- function _try_dbadmin_user($user, $passwd)
+ private function _try_dbadmin_user($user, $passwd)
 {
 global $DBParams;
 $AdminParams = $DBParams;
@@ -757,7 +757,7 @@
 return false;
 }
 
- function _db_init()
+ private function _db_init()
 {
 if (!$this->isSQL) return;
 
@@ -822,9 +822,9 @@
 * not into the huge serialized string.
 *
 * It is only rarelely needed: for current page only, if-not-modified,
- * but was extracetd for every simple page iteration.
+ * but was extracted for every simple page iteration.
 */
- function _upgrade_cached_html($verbose = true)
+ private function _upgrade_cached_html($verbose = true)
 {
 if (!$this->isSQL) return 0;
 $count = 0;
@@ -848,7 +848,7 @@
 $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html BLOB");
 if ($verbose)
 echo "<b>", _("CONVERTING"), "</b>", " ... ";
- $count = _convert_cached_html();
+ $count = $this->_convert_cached_html();
 if ($verbose)
 echo $count, " ", _("OK"), "<br />\n";
 } else {
@@ -863,7 +863,7 @@
 * move _cached_html for all pages from pagedata into a new separate blob.
 * decoupled from action=upgrade, so that it can be used by a WikiAdminUtils button also.
 */
- function _convert_cached_html()
+ private function _convert_cached_html()
 {
 if (!$this->isSQL) return 0;
 //if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
@@ -891,7 +891,7 @@
 /**
 * upgrade to 1.3.13 link structure.
 */
- function _upgrade_relation_links()
+ private function _upgrade_relation_links()
 {
 if ($this->phpwiki_version >= 1030.12200610 and $this->isSQL) {
 echo _("Check for relation field in link table"), " ...";
@@ -926,49 +926,11 @@
 }
 }
 
- function CheckPluginUpdate()
- {
- echo "<h2>", sprintf(_("Check for necessary %s updates"),
- _("plugin argument")), "</h2>\n";
-
- $this->_configUpdates = array();
- $this->_configUpdates[] = new UpgradePluginEntry
- ($this, array('key' => 'plugin_randompage_numpages',
- 'fixed_with' => 1012.0,
- //'header' => _("change RandomPage pages => numpages"),
- //'notice' =>_("found RandomPage plugin"),
- 'check_args' => array("plugin RandomPage pages",
- "/(<\?\s*plugin\s+ RandomPage\s+)pages/",
- "\1円numpages")));
- $this->_configUpdates[] = new UpgradePluginEntry
- ($this, array('key' => 'plugin_createtoc_position',
- 'fixed_with' => 1013.0,
- //'header' => _("change CreateToc align => position"),
- //'notice' =>_("found CreateToc plugin"),
- 'check_args' => array("plugin CreateToc align",
- "/(<\?\s*plugin\s+ CreateToc[^\?]+)align/",
- "\1円position")));
-
- if (empty($this->_configUpdates)) return;
- foreach ($this->_configUpdates as $update) {
- $allpages = $this->dbi->fullSearch($this->check_args[0]);
- while ($page = $allpages->next()) {
- $current = $page->getCurrentRevision();
- $pagetext = $current->getPackedContent();
- $update->check($this->check_args[1], $this->check_args[2], $pagetext, $page, $current);
- }
- }
- free($allpages);
- unset($pagetext);
- unset($current);
- unset($page);
- }
-
 /**
 * preg_replace over local file.
 * Only line-orientated matches possible.
 */
- function fixLocalFile($match, $replace, $filename)
+ public function fixLocalFile($match, $replace, $filename)
 {
 $o_filename = $filename;
 if (!file_exists($filename))
@@ -1016,7 +978,7 @@
 }
 }
 
- function CheckConfigUpdate()
+ public function CheckConfigUpdate()
 {
 echo "<h2>", sprintf(_("Check for necessary %s updates"),
 "config.ini"), "</h2>\n";
@@ -1105,12 +1067,12 @@
 }
 
 /* needed ? */
- function setApplicableCb($object)
+ public function setApplicableCb($object)
 {
 $this->applicable_cb =& $object;
 }
 
- function _check_if_already_fixed()
+ private function _check_if_already_fixed()
 {
 // not yet fixed?
 if (!isset($this->upgrade['name'])) return false;
@@ -1122,7 +1084,7 @@
 return false;
 }
 
- function pass()
+ public function pass()
 {
 // store in db no to fix again
 $this->upgrade['name'] = $this->parent->phpwiki_version;
@@ -1135,7 +1097,7 @@
 return true;
 }
 
- function fail()
+ public function fail()
 {
 echo '<span style="color: red; font-weight: bold; ">' . _("FAILED") . "</span>";
 if (isset($this->reason))
@@ -1145,7 +1107,7 @@
 return false;
 }
 
- function skip()
+ private function skip()
 { // not applicable
 if (isset($this->silent_skip)) return true;
 echo " " . _("Skipped.") . "<br />\n";
@@ -1153,7 +1115,7 @@
 return true;
 }
 
- function check($args = null)
+ public function check($args = null)
 {
 if ($this->header) echo $this->header, ' ... ';
 if ($when = $this->_check_if_already_fixed()) {
@@ -1187,18 +1149,18 @@
 
 class UpgradeConfigEntry extends UpgradeEntry
 {
- function _applicable_defined()
+ public function _applicable_defined()
 {
 return (boolean)defined($this->applicable_args[0]);
 }
 
- function _applicable_defined_and_empty()
+ public function _applicable_defined_and_empty()
 {
 $const = $this->applicable_args[0];
 return (boolean)(defined($const) and !constant($const));
 }
 
- function default_method($args)
+ public function default_method($args)
 {
 $match = $args[0];
 $replace = $args[1];
@@ -1206,87 +1168,6 @@
 }
 } // class UpdateConfigEntry
 
-/* This is different */
-class UpgradePluginEntry extends UpgradeEntry
-{
-
- /**
- * check all pages for a plugin match
- */
- public $silent_skip = 1;
-
- function default_method(&$args)
- {
- $match = $args[0];
- $replace = $args[1];
- $pagetext =& $args[2];
- $page =& $args[3];
- $current =& $args[4];
- if (preg_match($match, $pagetext)) {
- echo $page->getName(), " ", $this->notice, " ... ";
- if ($newtext = preg_replace($match, $replace, $pagetext)) {
- $meta = $current->_data;
- $meta['summary'] = "upgrade: " . $this->header;
- $page->save($newtext, $current->getVersion() + 1, $meta);
- $this->pass();
- } else {
- $this->fail();
- }
- }
- }
-} // class UpdatePluginEntry
-
-/**
- * fix custom themes which are not in our distribution
- * this should be optional
- */
-class UpgradeThemeEntry extends UpgradeEntry
-{
-
- function default_method(&$args)
- {
- $match = $args[0];
- $replace = $args[1];
- $template = $args[2];
- }
-
- function fixThemeTemplate($match, $new, $template)
- {
- // for all custom themes
- $ourthemes = explode(":", "blog:Crao:default:Hawaiian:MacOSX:MonoBook:Portland:shamino_com:SpaceWiki:wikilens:Wordpress");
- $themedir = NormalizeLocalFileName("themes");
- $dh = opendir($themedir);
- while ($r = readdir($dh)) {
- if (filetype($r) == 'dir' and $r[0] != '.' and !is_array($r, $ourthemes))
- $customthemes[] = $r;
- }
- $success = true;
- $errors = '';
- foreach ($customthemes as $customtheme) {
- $template = FindFile("themes/$customtheme/templates/$template");
- $do = $this->parent->fixLocalFile($match, $new, template);
- if (!$do[0]) {
- $success = false;
- $errors .= $do[1] . " ";
- echo $do[1];
- }
- }
- return array($success, $errors);
- }
-}
-
-/**
- * TODO:
- *
- * Upgrade: Base class for multipage worksteps
- * identify, validate, display options, next step
- */
-/*
-*/
-
-// TODO: At which step are we?
-// validate and do it again or go on with next step.
-
 /** entry function from lib/main.php
 */
 function DoUpgrade(&$request)
@@ -1303,8 +1184,6 @@
 @ini_set("implicit_flush", true);
 StartLoadDump($request, _("Upgrading this PhpWiki"));
 $upgrade = new Upgrade($request);
- //if (!$request->getArg('noindex'))
- // CheckOldIndexUpdate($request); // index.php => config.ini to upgrade from < 1.3.10
 if (!$request->getArg('nodb')) {
 $upgrade->CheckDatabaseUpdate($request); // first check cached_html and friends
 }
@@ -1312,15 +1191,9 @@
 $upgrade->CheckPgsrcUpdate($request);
 $upgrade->CheckActionPageUpdate($request);
 }
- // if (!$request->getArg('noplugin')) {
- // $upgrade->CheckPluginUpdate($request);
- // }
 if (!$request->getArg('noconfig')) {
 $upgrade->CheckConfigUpdate($request);
 }
- // This is optional and should be linked. In EndLoadDump or PhpWikiAdministration?
- //if ($request->getArg('theme'))
- // $upgrade->CheckThemeUpdate($request);
 EndLoadDump($request);
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9429
 http://sourceforge.net/p/phpwiki/code/9429
Author: vargenau
Date: 2014年12月08日 10:50:45 +0000 (2014年12月08日)
Log Message:
-----------
Allow upgrading pages with non-English locale
Modified Paths:
--------------
 trunk/lib/upgrade.php
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014年12月08日 09:37:54 UTC (rev 9428)
+++ trunk/lib/upgrade.php	2014年12月08日 10:50:45 UTC (rev 9429)
@@ -143,7 +143,7 @@
 if (substr($filename, -5, 5) == '.orig') continue;
 $pagename = urldecode($filename);
 if (isActionPage($pagename)) {
- $translation = gettext($pagename);
+ $translation = __($pagename);
 if ($translation == $pagename)
 $this->doPgsrcUpdate($pagename, $path, $filename);
 elseif (FindLocalizedFile('pgsrc/' . urlencode($translation), 1))
@@ -180,7 +180,12 @@
 if ($this->db_version < 1030.12200612) {
 echo "<h4>", _("rename to Help: pages"), "</h4>\n";
 }
- $path = FindLocalizedFile(WIKI_PGSRC);
+ $translation = __("HomePage");
+ if ($translation == "HomePage") {
+ $path = FindFile(WIKI_PGSRC);
+ } else {
+ $path = FindLocalizedFile(WIKI_PGSRC);
+ }
 $pgsrc = new fileSet($path);
 // fixme: verification, ...
 foreach ($pgsrc->getFiles() as $filename) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9428
 http://sourceforge.net/p/phpwiki/code/9428
Author: vargenau
Date: 2014年12月08日 09:37:54 +0000 (2014年12月08日)
Log Message:
-----------
Add class variables
Modified Paths:
--------------
 trunk/lib/upgrade.php
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014年12月05日 15:00:35 UTC (rev 9427)
+++ trunk/lib/upgrade.php	2014年12月08日 09:37:54 UTC (rev 9428)
@@ -51,8 +51,12 @@
 
 class Upgrade
 {
+ public $current_db_version;
+ public $error_caught;
+ public $_configUpdates;
+ public $check_args;
 
- function Upgrade(&$request)
+ function __construct(&$request)
 {
 $this->request =& $request;
 $this->dbi =& $request->_dbi; // no reference for dbadmin ?
@@ -226,7 +230,6 @@
 global $DBParams;
 if (!$this->isSQL) return;
 echo _("MISSING"), " ... \n";
- $backend = &$this->dbi->_backend->_dbh;
 /*
 $schema = findFile("schemas/${backend_type}.sql");
 if (!$schema) {
@@ -389,7 +392,7 @@
 */
 function CheckDatabaseUpdate()
 {
- global $DBAuthParams, $DBParams;
+ global $DBParams;
 
 echo "<h2>", sprintf(_("Check for necessary %s updates"),
 _("database")),
@@ -722,7 +725,7 @@
 
 function _try_dbadmin_user($user, $passwd)
 {
- global $DBParams, $DBAuthParams;
+ global $DBParams;
 $AdminParams = $DBParams;
 if (DATABASE_TYPE == 'SQL')
 $dsn = DB::parseDSN($AdminParams['dsn']);
@@ -818,7 +821,6 @@
 */
 function _upgrade_cached_html($verbose = true)
 {
- global $DBParams;
 if (!$this->isSQL) return 0;
 $count = 0;
 if ($this->phpwiki_version >= 1030.10) {
@@ -858,7 +860,6 @@
 */
 function _convert_cached_html()
 {
- global $DBParams;
 if (!$this->isSQL) return 0;
 //if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
 
@@ -885,7 +886,7 @@
 /**
 * upgrade to 1.3.13 link structure.
 */
- function _upgrade_relation_links($verbose = true)
+ function _upgrade_relation_links()
 {
 if ($this->phpwiki_version >= 1030.12200610 and $this->isSQL) {
 echo _("Check for relation field in link table"), " ...";
@@ -945,7 +946,7 @@
 
 if (empty($this->_configUpdates)) return;
 foreach ($this->_configUpdates as $update) {
- $pages = $this->dbi->fullSearch($this->check_args[0]);
+ $allpages = $this->dbi->fullSearch($this->check_args[0]);
 while ($page = $allpages->next()) {
 $current = $page->getCurrentRevision();
 $pagetext = $current->getPackedContent();
@@ -1055,13 +1056,20 @@
 
 class UpgradeEntry
 {
+ public $applicable_cb;
+ public $header;
+ public $fixed_with;
+ public $method_cb;
+ public $check_cb;
+ public $reason;
+
 /**
 * Add an upgrade item to be checked.
 *
 * @param object $parent The parent Upgrade class to inherit the version properties
 * @param array $params
 */
- function UpgradeEntry(&$parent, $params)
+ function __construct(&$parent, $params)
 {
 $this->parent =& $parent; // get the properties db_version
 foreach (array('key' => 'required',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9427
 http://sourceforge.net/p/phpwiki/code/9427
Author: vargenau
Date: 2014年12月05日 15:00:35 +0000 (2014年12月05日)
Log Message:
-----------
Update translations
Modified Paths:
--------------
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014年12月05日 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/de.po	2014年12月05日 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014年12月05日 15:43+0100\n"
+"POT-Creation-Date: 2014年12月05日 16:00+0100\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -4640,8 +4640,8 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
-msgstr "Aktion Seite"
+msgid "Action Pages"
+msgstr "Aktion Seiten"
 
 #, php-format
 msgid "Check for necessary theme %s updates"
@@ -6041,6 +6041,9 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "ActionPage"
+#~ msgstr "Aktion Seite"
+
 #~ msgid "ZIP files of database"
 #~ msgstr "Speichern und Archivieren"
 
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014年12月05日 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/es.po	2014年12月05日 15:00:35 UTC (rev 9427)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014年12月05日 15:43+0100\n"
+"POT-Creation-Date: 2014年12月05日 16:00+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -4518,7 +4518,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014年12月05日 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/fr.po	2014年12月05日 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014年12月05日 15:43+0100\n"
+"POT-Creation-Date: 2014年12月05日 16:00+0100\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -4584,15 +4584,15 @@
 msgid "Check for necessary %s updates"
 msgstr "Vérification des mises à jour nécessaires pour %s"
 
-msgid "ActionPage"
-msgstr "Pages d'action"
+msgid "Action Pages"
+msgstr "les pages d'action"
 
 #, php-format
 msgid "Check for necessary theme %s updates"
 msgstr "Vérification des mises à jour nécessaires pour le thème %s"
 
 msgid "rename to Help: pages"
-msgstr ""
+msgstr "renommer les pages d'aide"
 
 #, php-format
 msgid "rename %s to %s"
@@ -5958,6 +5958,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "ActionPage"
+#~ msgstr "Pages d'action"
+
 #~ msgid "ZIP files of database"
 #~ msgstr "Récupérer dans un fichier ZIP"
 
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014年12月05日 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/it.po	2014年12月05日 15:00:35 UTC (rev 9427)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014年12月05日 15:43+0100\n"
+"POT-Creation-Date: 2014年12月05日 16:00+0100\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -4483,7 +4483,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014年12月05日 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/ja.po	2014年12月05日 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014年12月05日 15:43+0100\n"
+"POT-Creation-Date: 2014年12月05日 16:00+0100\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4623,7 +4623,7 @@
 msgstr ""
 
 #, fuzzy
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr "操作ページ"
 
 #, php-format
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014年12月05日 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/nl.po	2014年12月05日 15:00:35 UTC (rev 9427)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014年12月05日 15:43+0100\n"
+"POT-Creation-Date: 2014年12月05日 16:00+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -4475,7 +4475,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014年12月05日 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/phpwiki.pot	2014年12月05日 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014年12月05日 15:43+0100\n"
+"POT-Creation-Date: 2014年12月05日 16:00+0100\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4467,7 +4467,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014年12月05日 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/sv.po	2014年12月05日 15:00:35 UTC (rev 9427)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014年12月05日 15:43+0100\n"
+"POT-Creation-Date: 2014年12月05日 16:00+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -4468,7 +4468,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014年12月05日 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/zh.po	2014年12月05日 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014年12月05日 15:43+0100\n"
+"POT-Creation-Date: 2014年12月05日 16:00+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -4699,7 +4699,7 @@
 msgstr "為 page "%s" 設定 acl."
 
 #, fuzzy
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr "動作頁面"
 
 #, fuzzy, php-format
@@ -6112,18 +6112,6 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
-#, fuzzy
-#~ msgid "Dump to directory"
-#~ msgstr "目錄 "%s""
-
-#, fuzzy
-#~ msgid "Upgrade"
-#~ msgstr "上傳"
-
-#, fuzzy
-#~ msgid "reverse"
-#~ msgstr "重設"
-
 #~ msgid "Unable to open directory "%s" for reading"
 #~ msgstr "無法開啟目錄 "%s" 進行讀取"
 
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9426
 http://sourceforge.net/p/phpwiki/code/9426
Author: vargenau
Date: 2014年12月05日 14:55:30 +0000 (2014年12月05日)
Log Message:
-----------
ActionPage --> Action Pages
Modified Paths:
--------------
 trunk/lib/upgrade.php
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014年12月05日 14:54:07 UTC (rev 9425)
+++ trunk/lib/upgrade.php	2014年12月05日 14:55:30 UTC (rev 9426)
@@ -115,7 +115,7 @@
 
 function CheckActionPageUpdate()
 {
- echo "<h2>", sprintf(_("Check for necessary %s updates"), _("ActionPage")), "</h2>\n";
+ echo "<h2>", sprintf(_("Check for necessary %s updates"), _("Action Pages")), "</h2>\n";
 // 1.3.13 before we pull in all missing pages, we rename existing ones
 $this->_rename_page_helper("_AuthInfo", "DebugAuthInfo");
 $this->_rename_page_helper("Help/_AuthInfoPlugin", "Help/DebugAuthInfoPlugin");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.