<?xml version="1.0" encoding="UTF-8"?>
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/" xmlns:taxo="http://purl.org/rss/1.0/modules/taxonomy/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:syn="http://purl.org/rss/1.0/modules/syndication/" xmlns:admin="http://webns.net/mvcb/">
  <channel rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs">
    <title>gmane.comp.cms.tiki.cvs</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs</link>
    <description/>
    <syn:updatePeriod>hourly</syn:updatePeriod>
    <syn:updateFrequency>1</syn:updateFrequency>
    <syn:updateBase>1901-01-01T00:00+00:00</syn:updateBase>
    <items>
      <rdf:Seq>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79106"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79105"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79104"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79103"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79102"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79101"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79100"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79099"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79098"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79097"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79096"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79095"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79094"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79093"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79092"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79091"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79090"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79089"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79088"/>
        <rdf:li rdf:resource="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79087"/>
      </rdf:Seq>
    </items>
    <image rdf:resource="http://gmane.org/img/gmane-25t.png"/>
    <textinput rdf:resource=""/>
  </channel>
  <image rdf:about="http://gmane.org/img/gmane-25t.png">
    <title>Gmane</title>
    <url>http://gmane.org/img/gmane-25t.png</url>
    <link>http://gmane.org</link>
  </image>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79106">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46040]branches/experimental/crypt_blowfish/</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79106</link>
    <description>&lt;pre&gt;Revision: 46040
          http://sourceforge.net/p/tikiwiki/code/46040
Author:   ppttrr
Date:     2013-05-24 22:27:30 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[BRANCH] Creation, branches/experimental/crypt_blowfish 0 to 46039

Added Paths:
-----------
    branches/experimental/crypt_blowfish/

Index: branches/experimental/crypt_blowfish
===================================================================
--- trunk2013-05-24 19:24:13 UTC (rev 46039)
+++ branches/experimental/crypt_blowfish2013-05-24 22:27:30 UTC (rev 46040)

Property changes on: branches/experimental/crypt_blowfish
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,26 ##
+ZendStudioServer
+var
+.project
+phpmyadmin
+.lastup
+ZendPlatform
+.settings
+templates_c
+db/lock
+tiki-emptycache.php
+modules/cache
+last.log
+.cache
+_htaccess
+.metadata*
+mods
+dummy.php
+.svnrev
+svn-commit.tmp
+.buildpath
+.htaccess
+maps
+project.index
+nbproject
+.idea
+vendor
Added: svn:mergeinfo
## -0,0 +1,&lt;/pre&gt;</description>
    <dc:creator>ppttrr-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T22:27:33</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79105">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46039] trunk</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79105</link>
    <description>&lt;pre&gt;Revision: 46039
          http://sourceforge.net/p/tikiwiki/code/46039
Author:   lphuberdeau
Date:     2013-05-24 19:24:13 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[NEW]?\194?\160Adding profile category exporter

Modified Paths:
--------------
    trunk/console.php
    trunk/lib/core/Tiki/Profile/InstallHandler/Category.php
    trunk/lib/core/Tiki/Profile/Writer.php

Added Paths:
-----------
    trunk/lib/core/Tiki/Command/ProfileExport/Category.php

Modified: trunk/console.php
===================================================================
--- trunk/console.php2013-05-24 19:10:24 UTC (rev 46038)
+++ trunk/console.php2013-05-24 19:24:13 UTC (rev 46039)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -78,11 +78,13 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
 
 if (file_exists('profiles/info.ini')) {
-$console-&amp;gt;add(new Tiki\Command\ProfileExport\WikiPage);
+$console-&amp;gt;add(new Tiki\Command\ProfileExport\Category);
+$console-&amp;gt;add(new Tiki\Command\ProfileExport\IncludeProfile);
+$console-&amp;gt;add(new Tiki\Command\ProfileExport\Preference);
 $console-&amp;gt;add(new Tiki\Command\ProfileE&lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T19:24:14</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79104">
    <title>Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46035]branches/11.x/lib/userprefs/userprefslib.php</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79104</link>
    <description>&lt;pre&gt;tks lp !


On 24 May 2013, at 20:15 , lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&amp;lt; at &amp;gt;public.gmane.org wrote:



------------------------------------------------------------------------------
Try New Relic Now &amp;amp; We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, &amp;amp; servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
&lt;/pre&gt;</description>
    <dc:creator>Bernard Sfez</dc:creator>
    <dc:date>2013-05-24T19:14:23</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79103">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46038] trunk/lib/core/Horde</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79103</link>
    <description>&lt;pre&gt;Revision: 46038
          http://sourceforge.net/p/tikiwiki/code/46038
Author:   lphuberdeau
Date:     2013-05-24 19:10:24 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[MOD] Updating Horde_Yaml to resolve an issue dumping data containing #

Modified Paths:
--------------
    trunk/lib/core/Horde/Yaml/Dumper.php
    trunk/lib/core/Horde/Yaml/Exception.php
    trunk/lib/core/Horde/Yaml/Loader.php
    trunk/lib/core/Horde/Yaml/Node.php
    trunk/lib/core/Horde/Yaml.php

Modified: trunk/lib/core/Horde/Yaml/Dumper.php
===================================================================
--- trunk/lib/core/Horde/Yaml/Dumper.php2013-05-24 18:07:14 UTC (rev 46037)
+++ trunk/lib/core/Horde/Yaml/Dumper.php2013-05-24 19:10:24 UTC (rev 46038)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -6,19 +6,19 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
  * implementation (http://spyc.sourceforge.net/), and portions are
  * copyright 2005-2006 Chris Wanstrath.
  *
- * &amp;lt; at &amp;gt;author   Chris Wanstrath (chris-G5sj8e7vJc8&amp;lt; at &amp;gt;public.gmane.org)
- * &amp;lt; at &amp;gt;author   Chuck Hagenbuch (chuck-FbxqJ5noB0fYtjvyW6yDsg&amp;lt; at &amp;gt;public.gmane.org)
-&lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T19:10:25</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79102">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46037] trunk</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79102</link>
    <description>&lt;pre&gt;Revision: 46037
          http://sourceforge.net/p/tikiwiki/code/46037
Author:   lphuberdeau
Date:     2013-05-24 18:07:14 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[MRG] Automatic merge, branches/11.x 46029 to 46036

Modified Paths:
--------------
    trunk/installer/schema/20121213_module_zone_enlarge_tiki.sql
    trunk/lib/core/TikiDb/Pdo.php
    trunk/lib/userprefs/userprefslib.php

Added Paths:
-----------
    trunk/installer/schema/20121213_module_zone_enlarge_tiki.php

Property Changed:
----------------
    trunk/

Index: trunk
===================================================================
--- trunk2013-05-24 17:31:37 UTC (rev 46036)
+++ trunk2013-05-24 18:07:14 UTC (rev 46037)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
 /branches/10.x:43596-44410,44444-44836,44907
-/branches/11.x:45702-46029
+/branches/11.x:45702-46036
 /branches/3.0:16998-18916
 /branches/4.x:22817-23908
 /branches/5.x:26025-2&lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T18:07:16</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79101">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46036] branches/11.x</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79101</link>
    <description>&lt;pre&gt;Revision: 46036
          http://sourceforge.net/p/tikiwiki/code/46036
Author:   lphuberdeau
Date:     2013-05-24 17:31:37 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[FIX]?\194?\160Make sure patch works even if the index is missing in the database

Modified Paths:
--------------
    branches/11.x/installer/schema/20121213_module_zone_enlarge_tiki.sql
    branches/11.x/lib/core/TikiDb/Pdo.php

Added Paths:
-----------
    branches/11.x/installer/schema/20121213_module_zone_enlarge_tiki.php

Added: branches/11.x/installer/schema/20121213_module_zone_enlarge_tiki.php
===================================================================
--- branches/11.x/installer/schema/20121213_module_zone_enlarge_tiki.php                        (rev 0)
+++ branches/11.x/installer/schema/20121213_module_zone_enlarge_tiki.php2013-05-24 17:31:37 UTC (rev 46036)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -0,0 +1,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
+&amp;lt;?php
+
+function pre_20121213_module_zone_enlarge_tiki($installer)
+{
+// Drop the index and ignore errors, no built-in syntax
+$installer-&amp;gt;que&lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T17:31:39</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79100">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46035]branches/11.x/lib/userprefs/userprefslib.php</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79100</link>
    <description>&lt;pre&gt;Revision: 46035
          http://sourceforge.net/p/tikiwiki/code/46035
Author:   lphuberdeau
Date:     2013-05-24 17:15:19 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[FIX] Hash the username for the avatar file path to avoid issues with UTF-8 characters in usernames

Modified Paths:
--------------
    branches/11.x/lib/userprefs/userprefslib.php

Modified: branches/11.x/lib/userprefs/userprefslib.php
===================================================================
--- branches/11.x/lib/userprefs/userprefslib.php2013-05-24 16:58:38 UTC (rev 46034)
+++ branches/11.x/lib/userprefs/userprefslib.php2013-05-24 17:15:19 UTC (rev 46035)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -35,7 +35,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 $userlib-&amp;gt;interSendUserInfo($prefs['interlist'][$prefs['feature_intertiki_mymaster']], $user);
 }
 
-$image = 'temp/public/' . $tikidomainslash . 'avatar_' . $user . '.*';
+$image = 'temp/public/' . $tikidomainslash . 'avatar_' . md5($user) . '.*';
 foreach ( glob($image) as $file ) {
 unlink($file);
 }
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -56,14 +56,12 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 function ge&lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T17:15:20</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79099">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46034]trunk/installer/shell.php</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79099</link>
    <description>&lt;pre&gt;Revision: 46034
          http://sourceforge.net/p/tikiwiki/code/46034
Author:   lphuberdeau
Date:     2013-05-24 16:58:38 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[FIX]?\194?\160When updating, more tiki libraries may be required

Modified Paths:
--------------
    trunk/installer/shell.php

Modified: trunk/installer/shell.php
===================================================================
--- trunk/installer/shell.php2013-05-24 16:26:55 UTC (rev 46033)
+++ trunk/installer/shell.php2013-05-24 16:58:38 UTC (rev 46034)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -52,6 +52,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 if ( $_SERVER['argc'] == 2 &amp;amp;&amp;amp; $_SERVER['argv'][1] == 'install' )
 $installer-&amp;gt;cleanInstall();
 else {
+require_once 'tiki-setup.php';
 $installer-&amp;gt;update();
 
 if (count($installer-&amp;gt;installed)) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Try New Relic Now &amp;amp; We'll Send You this Cool Shirt
New Relic &lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T16:58:39</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79098">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46033] trunk</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79098</link>
    <description>&lt;pre&gt;Revision: 46033
          http://sourceforge.net/p/tikiwiki/code/46033
Author:   lphuberdeau
Date:     2013-05-24 16:26:55 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[MOD] Allow to export preferences through profile export, adding meta-data to the preference definitions

Modified Paths:
--------------
    trunk/console.php
    trunk/lib/core/Tiki/Profile/Writer.php
    trunk/lib/prefs/areas.php
    trunk/lib/prefs/category.php
    trunk/lib/prefs/categorypath.php
    trunk/lib/prefs/contact.php
    trunk/lib/prefs/feature.php
    trunk/lib/prefs/flaggedrev.php
    trunk/lib/prefs/forum.php
    trunk/lib/prefs/global.php
    trunk/lib/prefs/home.php
    trunk/lib/prefs/mobile.php
    trunk/lib/prefs/scorm.php
    trunk/lib/prefs/tracker.php
    trunk/lib/prefs/unified.php
    trunk/lib/prefs/user.php
    trunk/lib/prefs/watershed.php
    trunk/lib/prefs/workspace.php
    trunk/lib/prefslib.php

Added Paths:
-----------
    trunk/lib/core/Tiki/Command/ProfileExport/Preference.php

Modified: trunk/consol&lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T16:26:57</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79097">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46032] trunk/lib/core</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79097</link>
    <description>&lt;pre&gt;Revision: 46032
          http://sourceforge.net/p/tikiwiki/code/46032
Author:   lphuberdeau
Date:     2013-05-24 15:18:37 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[MOD] Convert the search parameters within a URL-encoded string for profile export

Modified Paths:
--------------
    trunk/lib/core/Tiki/Profile/WriterHelper.php
    trunk/lib/core/Tracker/Field/Relation.php

Modified: trunk/lib/core/Tiki/Profile/WriterHelper.php
===================================================================
--- trunk/lib/core/Tiki/Profile/WriterHelper.php2013-05-24 14:52:48 UTC (rev 46031)
+++ trunk/lib/core/Tiki/Profile/WriterHelper.php2013-05-24 15:18:37 UTC (rev 46032)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -114,5 +114,25 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 return $matches-&amp;gt;getText();
 }
+
+public static function search_urlencoded(Tiki_Profile_Writer $writer, $value)
+{
+$searchlib = TikiLib::lib('unifiedsearch');
+$dataSource = $searchlib-&amp;gt;getProfileExportHelper();
+
+$data = array();
+parse_str($value, $data);
+foreach ($data as $key =&amp;gt; &amp;amp; $value) {
+if (&lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T15:18:38</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79096">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46031] trunk/lib</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79096</link>
    <description>&lt;pre&gt;Revision: 46031
          http://sourceforge.net/p/tikiwiki/code/46031
Author:   lphuberdeau
Date:     2013-05-24 14:52:48 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[MOD] Allow plugins to specify how to export the body portion - handling of the filter plugins for list, listexecute and customsearch

Modified Paths:
--------------
    trunk/lib/core/Search/ContentSource/ArticleSource.php
    trunk/lib/core/Search/ContentSource/BlogPostSource.php
    trunk/lib/core/Search/ContentSource/FileSource.php
    trunk/lib/core/Search/ContentSource/ForumPostSource.php
    trunk/lib/core/Search/ContentSource/TrackerItemSource.php
    trunk/lib/core/Search/GlobalSource/CategorySource.php
    trunk/lib/core/Tiki/Profile/WriterHelper.php
    trunk/lib/core/WikiParser/PluginMatcher.php
    trunk/lib/search/searchlib-unified.php
    trunk/lib/wiki-plugins/wikiplugin_customsearch.php
    trunk/lib/wiki-plugins/wikiplugin_list.php
    trunk/lib/wiki-plugins/wikiplugin_listexecute.php

Added Paths:
-----------
    trunk/&lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T14:52:49</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79095">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46030] trunk</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79095</link>
    <description>&lt;pre&gt;Revision: 46030
          http://sourceforge.net/p/tikiwiki/code/46030
Author:   lphuberdeau
Date:     2013-05-24 13:25:49 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[MRG] Automatic merge, branches/11.x 45999 to 46029

Modified Paths:
--------------
    trunk/lib/ckeditor_tiki/tikilink_dialog.js
    trunk/lib/headerlib.php
    trunk/lib/prefs/feed.php
    trunk/lib/setup/mobile.php
    trunk/lib/setup/theme.php
    trunk/lib/tiki-js.js
    trunk/lib/tikilib.php
    trunk/lib/userprefs/userprefslib.php
    trunk/lib/wiki/editlib.php
    trunk/lib/wiki-plugins/wikiplugin_slider.php
    trunk/templates/admin/include_module.tpl
    trunk/templates/admin/include_rss.tpl
    trunk/templates/tiki-show_help.tpl
    trunk/tiki-auto_save.php
    trunk/tiki-setup.php
    trunk/tiki-tc.php
    trunk/tiki-tracker_rss.php

Property Changed:
----------------
    trunk/

Index: trunk
===================================================================
--- trunk2013-05-24 10:22:56 UTC (rev 46029)
+++ trunk2013-05-24 &lt;/pre&gt;</description>
    <dc:creator>lphuberdeau-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T13:25:50</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79094">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46029]branches/11.x/lib/setup/mobile.php</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79094</link>
    <description>&lt;pre&gt;Revision: 46029
          http://sourceforge.net/p/tikiwiki/code/46029
Author:   jonnybradley
Date:     2013-05-24 10:22:56 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[FIX] mobile: Photoswipe and it's lib "klass" not happy with our js minify

Modified Paths:
--------------
    branches/11.x/lib/setup/mobile.php

Modified: branches/11.x/lib/setup/mobile.php
===================================================================
--- branches/11.x/lib/setup/mobile.php2013-05-23 22:04:36 UTC (rev 46028)
+++ branches/11.x/lib/setup/mobile.php2013-05-24 10:22:56 UTC (rev 46029)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -42,12 +42,13 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 $prefs['feature_fixed_width'] = 'n';
 $prefs['fgal_elfinder_feature'] = 'n';
 
+$headerlib = TikiLib::lib('header');
 $headerlib-&amp;gt;add_js('function sfHover() {alert("not working?");}', 100);// try and override the css menu func
 
 if ($prefs['feature_shadowbox'] === 'y') {
 $headerlib
--&amp;gt;add_jsfile('vendor/jquery/photoswipe/lib/klass.min.js')
--&amp;gt;add_jsfile("vendor/jquery/photoswipe/code.photosw&lt;/pre&gt;</description>
    <dc:creator>jonnybradley-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-24T10:22:58</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79093">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46028] branches/11.x</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79093</link>
    <description>&lt;pre&gt;Revision: 46028
          http://sourceforge.net/p/tikiwiki/code/46028
Author:   jyhem
Date:     2013-05-23 22:04:36 +0000 (Thu, 23 May 2013)
Log Message:
-----------
[FIX][bp/r46026] allows admins to edit comments (was possible in Tiki 6)

Revision Links:
--------------
    http://sourceforge.net/p/tikiwiki/code/46026

Modified Paths:
--------------
    branches/11.x/lib/core/Services/Comment/Controller.php

Property Changed:
----------------
    branches/11.x/

Index: branches/11.x
===================================================================
--- branches/11.x2013-05-23 21:51:34 UTC (rev 46027)
+++ branches/11.x2013-05-23 22:04:36 UTC (rev 46028)

Property changes on: branches/11.x
___________________________________________________________________
Modified: svn:mergeinfo
## -16,3 +16,4 ##
 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
 /branches/experimental/xajax_removal:31497
 /branches/proposals/4.x:24005
+/trunk:46026
\ No newline at&lt;/pre&gt;</description>
    <dc:creator>jyhem-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-23T22:04:38</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79092">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46027] branches/9.x</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79092</link>
    <description>&lt;pre&gt;Revision: 46027
          http://sourceforge.net/p/tikiwiki/code/46027
Author:   jyhem
Date:     2013-05-23 21:51:34 +0000 (Thu, 23 May 2013)
Log Message:
-----------
[FIX][bp/r44059][bp/r44137][bp/r46026]

Revision Links:
--------------
    http://sourceforge.net/p/tikiwiki/code/44059
    http://sourceforge.net/p/tikiwiki/code/44137
    http://sourceforge.net/p/tikiwiki/code/46026

Modified Paths:
--------------
    branches/9.x/lib/core/Services/Comment/Controller.php
    branches/9.x/lib/prefs/comments.php
    branches/9.x/templates/admin/include_comments.tpl
    branches/9.x/templates/comment/list.tpl

Added Paths:
-----------
    branches/9.x/templates/comment/edit.tpl

Modified: branches/9.x/lib/core/Services/Comment/Controller.php
===================================================================
--- branches/9.x/lib/core/Services/Comment/Controller.php2013-05-23 21:35:22 UTC (rev 46026)
+++ branches/9.x/lib/core/Services/Comment/Controller.php2013-05-23 21:51:34 UTC (rev 46027)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -29,14 +29,16 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;&lt;/pre&gt;</description>
    <dc:creator>jyhem-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-23T21:51:34</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79091">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46026]trunk/lib/core/Services/Comment/Controller.php</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79091</link>
    <description>&lt;pre&gt;Revision: 46026
          http://sourceforge.net/p/tikiwiki/code/46026
Author:   jyhem
Date:     2013-05-23 21:35:22 +0000 (Thu, 23 May 2013)
Log Message:
-----------
[FIX] Allow admins to edit comments (that worked in Tiki 6)

Modified Paths:
--------------
    trunk/lib/core/Services/Comment/Controller.php

Modified: trunk/lib/core/Services/Comment/Controller.php
===================================================================
--- trunk/lib/core/Services/Comment/Controller.php2013-05-22 17:31:52 UTC (rev 46025)
+++ trunk/lib/core/Services/Comment/Controller.php2013-05-23 21:35:22 UTC (rev 46026)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -557,8 +557,12 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 private function canEdit(array $comment)
 {
-global $prefs, $user;
+global $prefs, $user, $tiki_p_admin;
 
+if ($tiki_p_admin == 'y') {
+return true;
+}
+
 if ($prefs['comments_allow_correction'] != 'y') {
 return false;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


-------------------&lt;/pre&gt;</description>
    <dc:creator>jyhem-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-23T21:35:24</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79090">
    <title>[SPAM] tikiwiki-cvs:销S售类课C程系S列115898</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79090</link>
    <description>&lt;pre&gt;
115898ÏúSÊÛÀà¿ÎC³ÌÏµSÁÐ115898
------------------------------------------------------------------------------
Try New Relic Now &amp;amp; We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, &amp;amp; servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may_______________________________________________
Tikiwiki-cvs mailing list
Tikiwiki-cvs-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f&amp;lt; at &amp;gt;public.gmane.org
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
&lt;/pre&gt;</description>
    <dc:creator>袁</dc:creator>
    <dc:date>2013-05-23T18:11:41</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79089">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46025] branches/11.x/templates/admin/include_module. tpl</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79089</link>
    <description>&lt;pre&gt;Revision: 46025
          http://sourceforge.net/p/tikiwiki/code/46025
Author:   marclaporte
Date:     2013-05-22 17:31:52 +0000 (Wed, 22 May 2013)
Log Message:
-----------
Adding recent module prefs to the admin module panel (it was already in look &amp;amp; feel)

Modified Paths:
--------------
    branches/11.x/templates/admin/include_module.tpl

Modified: branches/11.x/templates/admin/include_module.tpl
===================================================================
--- branches/11.x/templates/admin/include_module.tpl2013-05-22 08:50:23 UTC (rev 46024)
+++ branches/11.x/templates/admin/include_module.tpl2013-05-22 17:31:52 UTC (rev 46025)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -30,6 +30,10 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {preference name=module_zones_bottom}
 &amp;lt;/fieldset&amp;gt;
 &amp;lt;/div&amp;gt;
+
+{preference name=module_file}
+{preference name=module_zone_available_extra}
+
 {remarksbox type="tip" title="{tr}Hint{/tr}"}
 {tr}If you lose your login module, use tiki-login_scr.php to be able to login!{/tr}
 {/remarksbox}

This was sent by the SourceForge.net&lt;/pre&gt;</description>
    <dc:creator>marclaporte-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-22T17:31:52</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79088">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46024]branches/9.x/tiki-auto_save.php</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79088</link>
    <description>&lt;pre&gt;Revision: 46024
          http://sourceforge.net/p/tikiwiki/code/46024
Author:   xavidp
Date:     2013-05-22 08:50:23 +0000 (Wed, 22 May 2013)
Log Message:
-----------
[bp/r46017][FIX]auto_save: Check the user doing the save or preview has permission and is the one currently editing the page. Thanks Marcela B?\195?\169n?\195?\169trix Also modernise library use and fix some missing and/or unset vars. Thanks jonnyb

Revision Links:
--------------
    http://sourceforge.net/p/tikiwiki/code/46017

Modified Paths:
--------------
    branches/9.x/tiki-auto_save.php

Modified: branches/9.x/tiki-auto_save.php
===================================================================
--- branches/9.x/tiki-auto_save.php2013-05-22 08:49:52 UTC (rev 46023)
+++ branches/9.x/tiki-auto_save.php2013-05-22 08:50:23 UTC (rev 46024)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -37,19 +37,29 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
 
 if (isset($_REQUEST['editor_id'])) {
+global $user;
+$tikilib = TikiLib::lib('tiki');
+$editlib = TikiLib::lib('edit');
+$smarty = TikiLib::lib('smarty');
+
+
 if (isset($&lt;/pre&gt;</description>
    <dc:creator>xavidp-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-22T08:50:24</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79087">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46023]branches/10.x/tiki-auto_save.php</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79087</link>
    <description>&lt;pre&gt;Revision: 46023
          http://sourceforge.net/p/tikiwiki/code/46023
Author:   xavidp
Date:     2013-05-22 08:49:52 +0000 (Wed, 22 May 2013)
Log Message:
-----------
[bp/r46017][FIX]auto_save: Check the user doing the save or preview has permission and is the one currently editing the page. Thanks Marcela B?\195?\169n?\195?\169trix Also modernise library use and fix some missing and/or unset vars. Thanks jonnyb

Revision Links:
--------------
    http://sourceforge.net/p/tikiwiki/code/46017

Modified Paths:
--------------
    branches/10.x/tiki-auto_save.php

Modified: branches/10.x/tiki-auto_save.php
===================================================================
--- branches/10.x/tiki-auto_save.php2013-05-21 18:55:08 UTC (rev 46022)
+++ branches/10.x/tiki-auto_save.php2013-05-22 08:49:52 UTC (rev 46023)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -37,19 +37,29 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
 
 if (isset($_REQUEST['editor_id'])) {
+global $user;
+$tikilib = TikiLib::lib('tiki');
+$editlib = TikiLib::lib('edit');
+$smarty = TikiLib::lib('smarty');
+
+
 if (iss&lt;/pre&gt;</description>
    <dc:creator>xavidp-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-22T08:49:52</dc:date>
  </item>
  <item rdf:about="http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79086">
    <title>[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46022]branches/10.x/templates/tiki-view_articles.tpl</title>
    <link>http://permalink.gmane.org/gmane.comp.cms.tiki.cvs/79086</link>
    <description>&lt;pre&gt;Revision: 46022
          http://sourceforge.net/p/tikiwiki/code/46022
Author:   jyhem
Date:     2013-05-21 18:55:08 +0000 (Tue, 21 May 2013)
Log Message:
-----------
[FIX][bp/r46019] Restore pagination (thanks Torsten)

Revision Links:
--------------
    http://sourceforge.net/p/tikiwiki/code/46019

Modified Paths:
--------------
    branches/10.x/templates/tiki-view_articles.tpl

Modified: branches/10.x/templates/tiki-view_articles.tpl
===================================================================
--- branches/10.x/templates/tiki-view_articles.tpl2013-05-21 18:54:29 UTC (rev 46021)
+++ branches/10.x/templates/tiki-view_articles.tpl2013-05-21 18:55:08 UTC (rev 46022)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -180,7 +180,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {if $tiki_p_edit_article eq 'y'}&amp;lt;a href="tiki-edit_article.php"&amp;gt;{tr}Add an article{/tr}&amp;lt;/a&amp;gt;{/if}
 {/if}
 {/section}
-{if !empty($listpages) &amp;amp;&amp;amp; (isset($usePagination) and $usePagination ne 'n')}
+{if !empty($listpages) &amp;amp;&amp;amp; (!isset($usePagination) or $usePagination ne 'n')}
 {pagination_links cant=$cant step=$maxArt&lt;/pre&gt;</description>
    <dc:creator>jyhem-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2013-05-21T18:55:09</dc:date>
  </item>
  <textinput rdf:about="http://search.gmane.org/?group=$group=gmane.comp.cms.tiki.cvs">
    <title>Search Engine</title>
    <description>Search the mailing list at Gmane</description>
    <name>query</name>
    <link>http://search.gmane.org/?group=$group=gmane.comp.cms.tiki.cvs</link>
  </textinput>
</rdf:RDF>
