Completed
Pull Request — master (#194)
by
unknown
15:06
created
lib/net/nemein/tag/exec/merge.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
 <h1>Merge tags</h1>
5 5
 
6 6
 <?php
7
-if (   isset($_POST['from'])
7
+if (isset($_POST['from'])
8 8
     && isset($_POST['to'])) {
9 9
     if (net_nemein_tag_handler::merge_tags($_POST['from'], $_POST['to'])) {
10 10
         echo "<p>Successfully merged tag \"{$_POST['from']}\" to \"{$_POST['to']}\"</p>\n";
Please login to merge, or discard this patch.
lib/net/nemein/wiki/midcom/interfaces.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 
42 42
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
43 43
     {
44
-        if (   $object instanceof midcom_db_article
44
+        if ($object instanceof midcom_db_article
45 45
             && $topic->id == $object->topic) {
46 46
             if ($object->name == 'index') {
47 47
                 return '';
Please login to merge, or discard this patch.
lib/net/nemein/wiki/handler/latest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
                     return;
51 51
                 }
52 52
 
53
-                if (   $history['date'] < $from
53
+                if ($history['date'] < $from
54 54
                     || $history['date'] > $to) {
55 55
                     // We can ignore revisions outside the timeframe
56 56
                     continue;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         $this->_seek_updated($from);
94 94
 
95 95
         $i = 0;
96
-        while (   $this->_updated_pages < $this->_max_pages
96
+        while ($this->_updated_pages < $this->_max_pages
97 97
                && $i < 20) {
98 98
             // Expand seek by another two weeks
99 99
             $to = $from;
Please login to merge, or discard this patch.
lib/net/nemein/wiki/wikipage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 
30 30
     public function _on_creating()
31 31
     {
32
-        if (   $this->title == ''
32
+        if ($this->title == ''
33 33
             || !$this->topic) {
34 34
             // We must have wikiword and topic at this stage
35 35
             return false;
Please login to merge, or discard this patch.
lib/net/nemein/rss/parser/item.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
     public function get_link($key = 0, $rel = 'alternate')
62 62
     {
63 63
         $link = parent::get_link($key, $rel);
64
-        if (   $rel !== 'alternate'
64
+        if ($rel !== 'alternate'
65 65
             || $key !== 0) {
66 66
             return $link;
67 67
         }
Please login to merge, or discard this patch.
lib/midcom/db/topic.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
     public function _on_loaded()
31 31
     {
32 32
         // if we are missing the component, use the nullcomponent.
33
-        if (   !$this->component
33
+        if (!$this->component
34 34
             || !array_key_exists($this->component, midcom::get()->componentloader->manifests)) {
35 35
             debug_add("Topic {$this->id} has no component assigned to it, using 'midcom.core.nullcomponent'.",
36 36
             MIDCOM_LOG_INFO);
Please login to merge, or discard this patch.
lib/midcom/services/indexer/document/midcom.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
      */
110 110
     public function members_to_fields()
111 111
     {
112
-        if (   empty($this->topic_guid)
112
+        if (empty($this->topic_guid)
113 113
             || empty($this->topic_url)
114 114
             || empty($this->component)) {
115 115
             //if one of those is missing, we override all three to ensure consistency
Please login to merge, or discard this patch.
lib/midgard/admin/user/validator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@
 block discarded – undo
27 27
         if (!empty($fields["username"])) {
28 28
             $user = midcom::get()->auth->get_user_by_name($fields["username"]);
29 29
 
30
-            if (   $user
31
-                && (   !isset($fields['person'])
30
+            if ($user
31
+                && (!isset($fields['person'])
32 32
                     || $user->guid != $fields['person'])) {
33 33
                 $result["username"] = sprintf(midcom::get()->i18n->get_string("username %s is already in use", "midgard.admin.user"), $fields['username']);
34 34
             }
Please login to merge, or discard this patch.
lib/org/openpsa/documents/directory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
         $ownerwg = $this->get_parameter('org.openpsa.core', 'orgOpenpsaOwnerWg');
21 21
         $accesstype = $this->get_parameter('org.openpsa.core', 'orgOpenpsaAccesstype');
22 22
 
23
-        if (   $ownerwg
23
+        if ($ownerwg
24 24
             && $accesstype) {
25 25
             // Sync the object's ACL properties into MidCOM ACL system
26 26
             $sync = new org_openpsa_core_acl_synchronizer();
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     private function _update_parent_timestamp()
42 42
     {
43 43
         $parent = $this->get_parent();
44
-        if (   $parent
44
+        if ($parent
45 45
             && $parent->component == 'org.openpsa.documents') {
46 46
             midcom::get()->auth->request_sudo('org.openpsa.documents');
47 47
 
Please login to merge, or discard this patch.